From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751534AbbIGJ5f (ORCPT ); Mon, 7 Sep 2015 05:57:35 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:57058 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750752AbbIGJ5d (ORCPT ); Mon, 7 Sep 2015 05:57:33 -0400 Subject: Re: [PATCH v4 04/13] otg-fsm: move usb_bus_start_enum into otg-fsm->ops To: Peter Chen References: <1440422484-4737-1-git-send-email-rogerq@ti.com> <1440422484-4737-5-git-send-email-rogerq@ti.com> <20150907012437.GH4914@shlinux2> CC: , , , , , , , , , , , From: Roger Quadros Message-ID: <55ED5F81.5060601@ti.com> Date: Mon, 7 Sep 2015 12:57:21 +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: <20150907012437.GH4914@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 07/09/15 04:24, Peter Chen wrote: > On Mon, Aug 24, 2015 at 04:21:15PM +0300, Roger Quadros wrote: >> This is to prevent missing symbol build error if OTG is >> enabled (built-in) and HCD core (CONFIG_USB) is module. >> >> Signed-off-by: Roger Quadros >> Acked-by: Peter Chen >> --- >> drivers/usb/common/usb-otg-fsm.c | 6 ++++-- >> drivers/usb/phy/phy-fsl-usb.c | 2 ++ >> include/linux/usb/otg-fsm.h | 1 + >> 3 files changed, 7 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/usb/common/usb-otg-fsm.c b/drivers/usb/common/usb-otg-fsm.c >> index a46f29a..6e56c8c 100644 >> --- a/drivers/usb/common/usb-otg-fsm.c >> +++ b/drivers/usb/common/usb-otg-fsm.c >> @@ -165,8 +165,10 @@ static int otg_set_state(struct otg_fsm *fsm, enum usb_otg_state new_state) >> otg_loc_conn(fsm, 0); >> otg_loc_sof(fsm, 1); >> otg_set_protocol(fsm, PROTO_HOST); >> - usb_bus_start_enum(fsm->otg->host, >> - fsm->otg->host->otg_port);usb_bus_start_enum >> + if (fsm->ops->start_enum) { >> + fsm->ops->start_enum(fsm->otg->host, >> + fsm->otg->host->otg_port); >> + } >> break; >> case OTG_STATE_A_IDLE: >> otg_drv_vbus(fsm, 0); >> diff --git a/drivers/usb/phy/phy-fsl-usb.c b/drivers/usb/phy/phy-fsl-usb.c >> index ee3f2c2..19541ed 100644 >> --- a/drivers/usb/phy/phy-fsl-usb.c >> +++ b/drivers/usb/phy/phy-fsl-usb.c >> @@ -783,6 +783,8 @@ static struct otg_fsm_ops fsl_otg_ops = { >> >> .start_host = fsl_otg_start_host, >> .start_gadget = fsl_otg_start_gadget, >> + >> + .start_enum = usb_bus_start_enum, >> }; >> >> /* Initialize the global variable fsl_otg_dev and request IRQ for OTG */ >> diff --git a/include/linux/usb/otg-fsm.h b/include/linux/usb/otg-fsm.h >> index 672551c..75e82cc 100644 >> --- a/include/linux/usb/otg-fsm.h >> +++ b/include/linux/usb/otg-fsm.h >> @@ -199,6 +199,7 @@ struct otg_fsm_ops { >> void (*del_timer)(struct otg_fsm *fsm, enum otg_fsm_timer timer); >> int (*start_host)(struct otg_fsm *fsm, int on); >> int (*start_gadget)(struct otg_fsm *fsm, int on); >> + int (*start_enum)(struct usb_bus *bus, unsigned port_num); >> }; >> >> > > Get one build warning: > > In file included from /u/home/b29397/work/projects/usb/drivers/usb/chipidea/udc.c:23:0: > /u/home/b29397/work/projects/usb/include/linux/usb/otg-fsm.h:207:27: warning: 'struct usb_bus' declared inside parameter list > int (*start_enum)(struct usb_bus *bus, unsigned port_num); > ^ > /u/home/b29397/work/projects/usb/include/linux/usb/otg-fsm.h:207:27: warning: its scope is only this definition or declaration, which is probably not what you want > > It probably dues to we should not have struct usb_bus* at udc driver > How about changing it to struct otg_fsm instead like the other APIs? And do we leave usb_bus_start_enum() as it is? cheers, -roger