From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754092AbbIIJjk (ORCPT ); Wed, 9 Sep 2015 05:39:40 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:38150 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752076AbbIIJje (ORCPT ); Wed, 9 Sep 2015 05:39:34 -0400 Subject: Re: [PATCH v4 10/13] usb: hcd: Adapt to OTG core To: Peter Chen References: <1440422484-4737-1-git-send-email-rogerq@ti.com> <1440422484-4737-11-git-send-email-rogerq@ti.com> <20150909022336.GG7802@shlinux2> CC: , , , , , , , , , , , From: Roger Quadros Message-ID: <55EFFE44.7010304@ti.com> Date: Wed, 9 Sep 2015 12:39:16 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <20150909022336.GG7802@shlinux2> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/09/15 05:23, Peter Chen wrote: > On Mon, Aug 24, 2015 at 04:21:21PM +0300, Roger Quadros wrote: >> The existing usb_add/remove_hcd() functionality >> remains unchanged for non-OTG devices. For OTG >> devices they only register the HCD with the OTG core. >> >> Introduce usb_otg_add/remove_hcd() for use by OTG core. >> These functions actually add/remove the HCD. >> >> Signed-off-by: Roger Quadros >> --- >> drivers/usb/core/hcd.c | 55 +++++++++++++++++++++++++++++++++++++++++++++----- >> 1 file changed, 50 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c >> index c0fd1f6..4851682 100644 >> --- a/drivers/usb/core/hcd.c >> +++ b/drivers/usb/core/hcd.c >> @@ -46,6 +46,7 @@ >> #include >> #include >> #include >> +#include >> >> #include "usb.h" >> >> @@ -2625,8 +2626,8 @@ static void usb_put_invalidate_rhdev(struct usb_hcd *hcd) >> * buffers of consistent memory, register the bus, request the IRQ line, >> * and call the driver's reset() and start() routines. >> */ >> -int usb_add_hcd(struct usb_hcd *hcd, >> - unsigned int irqnum, unsigned long irqflags) >> +static int usb_otg_add_hcd(struct usb_hcd *hcd, >> + unsigned int irqnum, unsigned long irqflags) > > You may change the kernel doc to this name too. Yes. > >> { >> int retval; >> struct usb_device *rhdev; >> @@ -2839,17 +2840,16 @@ err_phy: >> } >> return retval; >> } >> -EXPORT_SYMBOL_GPL(usb_add_hcd); >> >> /** >> - * usb_remove_hcd - shutdown processing for generic HCDs >> + * usb_otg_remove_hcd - shutdown processing for generic HCDs >> * @hcd: the usb_hcd structure to remove >> * Context: !in_interrupt() >> * >> * Disconnects the root hub, then reverses the effects of usb_add_hcd(), >> * invoking the HCD's stop() method. >> */ >> -void usb_remove_hcd(struct usb_hcd *hcd) >> +static void usb_otg_remove_hcd(struct usb_hcd *hcd) >> { >> struct usb_device *rhdev = hcd->self.root_hub; >> >> @@ -2923,6 +2923,51 @@ void usb_remove_hcd(struct usb_hcd *hcd) >> >> usb_put_invalidate_rhdev(hcd); >> } >> + >> +static struct otg_hcd_ops otg_hcd_intf = { >> + .add = usb_otg_add_hcd, >> + .remove = usb_otg_remove_hcd, >> +}; >> + >> +/** >> + * usb_add_hcd - finish generic HCD structure initialization and register >> + * @hcd: the usb_hcd structure to initialize >> + * @irqnum: Interrupt line to allocate >> + * @irqflags: Interrupt type flags >> + * >> + * Finish the remaining parts of generic HCD initialization: allocate the >> + * buffers of consistent memory, register the bus, request the IRQ line, >> + * and call the driver's reset() and start() routines. >> + * If it is an OTG device then it only registers the HCD with OTG core. >> + * >> + */ >> +int usb_add_hcd(struct usb_hcd *hcd, >> + unsigned int irqnum, unsigned long irqflags) >> +{ >> + /* If OTG device, OTG core takes care of adding HCD */ >> + if (usb_otg_register_hcd(hcd, irqnum, irqflags, &otg_hcd_intf)) >> + return usb_otg_add_hcd(hcd, irqnum, irqflags); >> + >> + return 0; >> +} >> +EXPORT_SYMBOL_GPL(usb_add_hcd); >> + >> +/** >> + * usb_remove_hcd - shutdown processing for generic HCDs >> + * @hcd: the usb_hcd structure to remove >> + * Context: !in_interrupt() >> + * >> + * Disconnects the root hub, then reverses the effects of usb_add_hcd(), >> + * invoking the HCD's stop() method. >> + * If it is an OTG device then it unregisters the HCD from OTG core >> + * as well. >> + */ >> +void usb_remove_hcd(struct usb_hcd *hcd) >> +{ >> + /* If OTG device, OTG core takes care of stopping HCD */ >> + if (usb_otg_unregister_hcd(hcd)) >> + usb_otg_remove_hcd(hcd); >> +} >> EXPORT_SYMBOL_GPL(usb_remove_hcd); >> >> void >> -- >> 2.1.4 >> > -- cheers, -roger