From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753459AbbEDM4o (ORCPT ); Mon, 4 May 2015 08:56:44 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:26110 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753978AbbEDMzi (ORCPT ); Mon, 4 May 2015 08:55:38 -0400 X-AuditID: cbfee61a-f79516d000006302-dc-55476c48c2e5 From: Robert Baldyga To: balbi@ti.com Cc: gregkh@linuxfoundation.org, m.szyprowski@samsung.com, andrzej.p@samsung.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Robert Baldyga Subject: [PATCH v2 3/5] usb: composite: add bind_deactivated flag to usb_function Date: Mon, 04 May 2015 14:55:13 +0200 Message-id: <1430744115-22096-4-git-send-email-r.baldyga@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1430744115-22096-1-git-send-email-r.baldyga@samsung.com> References: <1430744115-22096-1-git-send-email-r.baldyga@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjluLIzCtJLcpLzFFi42I5/e+xgK5HjnuoweVmLotZL9tZLA7er7do XryezeLyrjlsFouWtTJbrD1yl93iweGd7A7sHvvnrmH36NuyitHj+I3tTB6fN8kFsERx2aSk 5mSWpRbp2yVwZVx4dZOtoJG34ueTn4wNjA3cXYycHBICJhJTH95ghrDFJC7cW8/WxcjFISSw iFFiwo7PzBDOT0aJxR9XgVWxCehIbPk+gRHEFhEQkFj/4hI7iM0ssIVR4vMRHRBbWCBYoq9v A1g9i4CqxPnX15lAbF4BV4nPzTeYILbJSZw8NpkVxOYUcJOY/+EO2BwhoJqDFzYzTmDkXcDI sIpRNLUguaA4KT3XUK84Mbe4NC9dLzk/dxMjOJSeSe1gXNlgcYhRgINRiYf3xCq3UCHWxLLi ytxDjBIczEoivOER7qFCvCmJlVWpRfnxRaU5qcWHGKU5WJTEeefoyoUKCaQnlqRmp6YWpBbB ZJk4OKUaGEUXNwYrxthdq765YF351LqnMT5lDerPXJksXdMrN6XVVXO2Wuxx5Jgx38BnZc7y hdMn+y/WvLJo/42S6yec6iccPnLzSp3TI0MpR4YtXFzPft5Uinz1qfQWl1+D8oEtkVsL/Wac K426Zx+jtzDXfpuE2ZXw8Ac8T3PmPnP28OT4/jB8WaegtRJLcUaioRZzUXEiAPC+IRshAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch introduces 'bind_deactivated' flag in struct usb_function. Functions which don't want to be activated automatically after bind should set this flag, and when they start to be ready to work they should call usb_function_activate(). When USB function sets 'bind_deactivated' flag, initial deactivation counter is incremented automatically, so there is no need to call usb_function_deactivate() in function bind. Signed-off-by: Robert Baldyga --- drivers/usb/gadget/composite.c | 6 ++++++ include/linux/usb/composite.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 9ed77f4..cdb9a5c 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -209,6 +209,12 @@ int usb_add_function(struct usb_configuration *config, function->config = config; list_add_tail(&function->list, &config->functions); + if (function->bind_deactivated) { + value = usb_function_deactivate(function); + if (value) + goto done; + } + /* REVISIT *require* function->bind? */ if (function->bind) { value = function->bind(config, function); diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h index 2511469..1074b89 100644 --- a/include/linux/usb/composite.h +++ b/include/linux/usb/composite.h @@ -228,6 +228,8 @@ struct usb_function { struct list_head list; DECLARE_BITMAP(endpoints, 32); const struct usb_function_instance *fi; + + unsigned int bind_deactivated:1; }; int usb_add_function(struct usb_configuration *, struct usb_function *); -- 1.9.1