| Message ID | 1434569645-30322-2-git-send-email-hdegoede@redhat.com |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
On 17 June 2015 at 13:33, Hans de Goede <hdegoede@redhat.com> wrote: > There is no harm in declaring the function prototypes even if nothing > implements them, and when CONFIG_DM_USB=y the various usb functions are > available regardless of any controller drivers being enabled. > > This fixes compile warnings due to missing prototypes on ARCHs where > the ARCH Kconfig always enables CONFIG_DM_USB and various usb drivers. > > One could argue that in the case of no controllers CONFIG_DM_USB should not > be set, but this problem is typically seen during bringup of boards which > do actually have usb controllers. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > Changes in v2: > -Simply always define the function prototypes instead of adding yet another > condition to the already unwieldly #if def ... || def ... condition > --- > include/usb.h | 15 --------------- > 1 file changed, 15 deletions(-) Acked-by: Simon Glass <sjg@chromium.org>
On 28 June 2015 at 21:44, Simon Glass <sjg@chromium.org> wrote: > On 17 June 2015 at 13:33, Hans de Goede <hdegoede@redhat.com> wrote: >> There is no harm in declaring the function prototypes even if nothing >> implements them, and when CONFIG_DM_USB=y the various usb functions are >> available regardless of any controller drivers being enabled. >> >> This fixes compile warnings due to missing prototypes on ARCHs where >> the ARCH Kconfig always enables CONFIG_DM_USB and various usb drivers. >> >> One could argue that in the case of no controllers CONFIG_DM_USB should not >> be set, but this problem is typically seen during bringup of boards which >> do actually have usb controllers. >> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> --- >> Changes in v2: >> -Simply always define the function prototypes instead of adding yet another >> condition to the already unwieldly #if def ... || def ... condition >> --- >> include/usb.h | 15 --------------- >> 1 file changed, 15 deletions(-) > > Acked-by: Simon Glass <sjg@chromium.org> Note: this was already applied to mainline.
diff --git a/include/usb.h b/include/usb.h index c709ce2..dca512d 100644 --- a/include/usb.h +++ b/include/usb.h @@ -171,17 +171,6 @@ enum usb_init_type { * this is how the lowlevel part communicate with the outer world */ -#if defined(CONFIG_USB_UHCI) || defined(CONFIG_USB_OHCI) || \ - defined(CONFIG_USB_EHCI) || defined(CONFIG_USB_OHCI_NEW) || \ - defined(CONFIG_USB_SL811HS) || defined(CONFIG_USB_ISP116X_HCD) || \ - defined(CONFIG_USB_R8A66597_HCD) || defined(CONFIG_USB_DAVINCI) || \ - defined(CONFIG_USB_OMAP3) || defined(CONFIG_USB_DA8XX) || \ - defined(CONFIG_USB_BLACKFIN) || defined(CONFIG_USB_AM35X) || \ - defined(CONFIG_USB_MUSB_DSPS) || defined(CONFIG_USB_MUSB_AM35X) || \ - defined(CONFIG_USB_MUSB_OMAP2PLUS) || defined(CONFIG_USB_MUSB_SUNXI) || \ - defined(CONFIG_USB_XHCI) || defined(CONFIG_USB_DWC2) || \ - defined(CONFIG_USB_EMUL) - int usb_lowlevel_init(int index, enum usb_init_type init, void **controller); int usb_lowlevel_stop(int index); @@ -216,12 +205,8 @@ void *poll_int_queue(struct usb_device *dev, struct int_queue *queue); * in boards init functions e.g. udc_disconnect() used for * forced device disconnection from host. */ -#elif defined(CONFIG_USB_GADGET_PXA2XX) - extern void udc_disconnect(void); -#endif - /* * board-specific hardware initialization, called by * usb drivers and u-boot commands
There is no harm in declaring the function prototypes even if nothing implements them, and when CONFIG_DM_USB=y the various usb functions are available regardless of any controller drivers being enabled. This fixes compile warnings due to missing prototypes on ARCHs where the ARCH Kconfig always enables CONFIG_DM_USB and various usb drivers. One could argue that in the case of no controllers CONFIG_DM_USB should not be set, but this problem is typically seen during bringup of boards which do actually have usb controllers. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- Changes in v2: -Simply always define the function prototypes instead of adding yet another condition to the already unwieldly #if def ... || def ... condition --- include/usb.h | 15 --------------- 1 file changed, 15 deletions(-)