Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1220030
| From | Roger Quadros <rogerq@ti.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH v4 04/13] otg-fsm: move usb_bus_start_enum into otg-fsm->ops |
| Date | 2015-09-07 12:00 +0200 |
| Message-ID | <q61nr-1ZQ-3@gated-at.bofh.it> (permalink) |
| References | <q0ZZ0-vR-3@gated-at.bofh.it> <q0ZZ2-vR-41@gated-at.bofh.it> <q61nr-1ZQ-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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 <rogerq@ti.com>
>> Acked-by: Peter Chen <peter.chen@freescale.com>
>> ---
>> 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
--
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/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v4 00/13] USB: OTG/DRD Core functionality Roger Quadros <rogerq@ti.com> - 2015-08-24 15:30 +0200
[PATCH v4 04/13] otg-fsm: move usb_bus_start_enum into otg-fsm->ops Roger Quadros <rogerq@ti.com> - 2015-08-24 15:30 +0200
Re: [PATCH v4 04/13] otg-fsm: move usb_bus_start_enum into otg-fsm->ops Roger Quadros <rogerq@ti.com> - 2015-09-07 12:00 +0200
Re: [PATCH v4 04/13] otg-fsm: move usb_bus_start_enum into otg-fsm->ops Roger Quadros <rogerq@ti.com> - 2015-09-08 10:30 +0200
[PATCH v4 13/13] usb: otg: Add dual-role device (DRD) support Roger Quadros <rogerq@ti.com> - 2015-08-24 15:30 +0200
Re: [PATCH v4 13/13] usb: otg: Add dual-role device (DRD) support Roger Quadros <rogerq@ti.com> - 2015-09-07 12:00 +0200
Re: [PATCH v4 07/13] usb: otg: add OTG core Roger Quadros <rogerq@ti.com> - 2015-09-07 12:30 +0200
Re: [PATCH v4 07/13] usb: otg: add OTG core Roger Quadros <rogerq@ti.com> - 2015-09-08 14:30 +0200
Re: [PATCH v4 07/13] usb: otg: add OTG core Alan Stern <stern@rowland.harvard.edu> - 2015-09-08 16:40 +0200
Re: [PATCH v4 07/13] usb: otg: add OTG core Roger Quadros <rogerq@ti.com> - 2015-09-08 19:40 +0200
Re: [PATCH v4 07/13] usb: otg: add OTG core Roger Quadros <rogerq@ti.com> - 2015-09-09 11:10 +0200
Re: [PATCH v4 07/13] usb: otg: add OTG core Roger Quadros <rogerq@ti.com> - 2015-09-09 11:40 +0200
Re: [PATCH v4 07/13] usb: otg: add OTG core Roger Quadros <rogerq@ti.com> - 2015-09-09 12:30 +0200
Re: [PATCH v4 07/13] usb: otg: add OTG core Roger Quadros <rogerq@ti.com> - 2015-09-10 16:20 +0200
Re: [PATCH v4 07/13] usb: otg: add OTG core Roger Quadros <rogerq@ti.com> - 2015-09-07 13:00 +0200
Re: [PATCH v4 07/13] usb: otg: add OTG core Roger Quadros <rogerq@ti.com> - 2015-09-09 12:10 +0200
Re: [PATCH v4 07/13] usb: otg: add OTG core Roger Quadros <rogerq@ti.com> - 2015-09-10 16:20 +0200
Re: [PATCH v4 00/13] USB: OTG/DRD Core functionality Roger Quadros <rogerq@ti.com> - 2015-09-07 13:50 +0200
csiph-web