Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754580AbbKCM45 (ORCPT ); Tue, 3 Nov 2015 07:56:57 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:35008 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754277AbbKCMzK (ORCPT ); Tue, 3 Nov 2015 07:55:10 -0500 X-AuditID: cbfee61b-f79d56d0000048c5-a4-5638aeadf8b2 From: Robert Baldyga To: balbi@ti.com Cc: gregkh@linuxfoundation.org, andrzej.p@samsung.com, m.szyprowski@samsung.com, b.zolnierkie@samsung.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Robert Baldyga Subject: [PATCH 18/23] usb: gadget: composite: enable adding USB functions using new API Date: Tue, 03 Nov 2015 13:53:57 +0100 Message-id: <1446555242-3733-19-git-send-email-r.baldyga@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1446555242-3733-1-git-send-email-r.baldyga@samsung.com> References: <1446555242-3733-1-git-send-email-r.baldyga@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprCLMWRmVeSWpSXmKPExsVy+t9jQd216yzCDNo65S1mvWxnsdg4Yz2r xcH79RbNi9ezWVzeNYfNYtGyVmaLtUfusls8OLyT3YHDY//cNewefVtWMXocv7GdyePzJrkA ligum5TUnMyy1CJ9uwSujMsn1zEWdIhUnHt9h72Bca5AFyMnh4SAicT0NX/ZIGwxiQv31gPZ XBxCArMYJSY1PmaCcH4ySmy+voEVpIpNQEdiy/cJjCC2iICAxPoXl9hBipgFzjFKPLzTBpYQ FoiSeNl9GMxmEVCV6FjUydzFyMHBK+AqsXizOcQ2OYmTxyazgoQ5gcKX3imDmEICLhLHt/NM YORdwMiwilEitSC5oDgpPdcoL7Vcrzgxt7g0L10vOT93EyM4rJ5J72A8vMv9EKMAB6MSD++C JeZhQqyJZcWVuYcYJTiYlUR4d8+1CBPiTUmsrEotyo8vKs1JLT7EKM3BoiTOq+9pFCYkkJ5Y kpqdmlqQWgSTZeLglGpgnMa4s1ZjOZfS/G1f27gSeHZkn/84P0Jj7dmJ7EJlN/fv/dp/6m7z 6oPdV5L/Hf7w/zl7kfpJpePvTnkrGU2XvpHNeLXLtObQulfbvqietBDI+p85zUC/7ubR//d7 l6lEvfYNczJXulQ+adO2rQyVDFsdN+WXb78ulnvEva3qGpviCbWrvnxP7ZVYijMSDbWYi4oT AScaLFsnAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2716 Lines: 102 Enable adding USB functions which use new API. Check if all necessary function ops are supplied and call prep_descs() to allow function register it's entity descriptors. Notice that bind() function is not called for USB functions using new API, as now bind procedure is handled for them in composite framework. Signed-off-by: Robert Baldyga --- drivers/usb/gadget/composite.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 9db8924..91ed45d 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -181,6 +181,8 @@ ep_found: } EXPORT_SYMBOL_GPL(config_ep_by_speed); +static inline bool usb_function_is_new_api(struct usb_function *f); + /** * usb_add_function() - add a function to a configuration * @config: the configuration @@ -198,15 +200,12 @@ EXPORT_SYMBOL_GPL(config_ep_by_speed); int usb_add_function(struct usb_configuration *config, struct usb_function *function) { - int value = -EINVAL; + int value; DBG(config->cdev, "adding '%s'/%p to config '%s'/%p\n", function->name, function, config->label, config); - if (!function->set_alt || !function->disable) - goto done; - function->config = config; list_add_tail(&function->list, &config->functions); @@ -216,13 +215,22 @@ int usb_add_function(struct usb_configuration *config, goto done; } + value = -EINVAL; + + if (!function->set_alt) + goto done; + + if (usb_function_is_new_api(function)) + goto new_api; + + if (!function->disable) + goto done; + /* REVISIT *require* function->bind? */ if (function->bind) { value = function->bind(config, function); - if (value < 0) { - list_del(&function->list); - function->config = NULL; - } + if (value < 0) + goto done; } else value = 0; @@ -238,10 +246,24 @@ int usb_add_function(struct usb_configuration *config, if (!config->superspeed && function->ss_descriptors) config->superspeed = true; + goto done; + +new_api: + if (!function->prep_descs) + goto done; + + if (!function->clear_alt) + goto done; + + value = function->prep_descs(function); + done: - if (value) + if (value) { + list_del(&function->list); + function->config = NULL; DBG(config->cdev, "adding '%s'/%p --> %d\n", function->name, function, value); + } return value; } EXPORT_SYMBOL_GPL(usb_add_function); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/