colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: musb-new: omap2430: Fix compilation warning with USB_MUSB_GADGET

Browse Source 
This commit addresses the following warning, when _NOT_ USB_MUSB_HOST:

[...]
  CC      drivers/usb/gadget/f_mass_storage.o
  CC      drivers/usb/musb-new/omap2430.o
  CC      drivers/usb/gadget/f_fastboot.o
  CC      env/common.o
  CC      env/env.o
/src/etinker/software/u-boot-master/drivers/usb/musb-new/omap2430.c: In function ‘omap2430_musb_probe’:
/src/etinker/software/u-boot-master/drivers/usb/musb-new/omap2430.c:239:6: warning: assignment to ‘int’ from ‘struct musb *’ makes integer from pointer without a cast [-Wint-conversion]
  ret = musb_register(&platdata->plat,
      ^
  LD      drivers/usb/host/built-in.o
  CC      drivers/usb/gadget/f_sdp.o
  CC      fs/ext4/ext4fs.o
[...]

Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
This commit is contained in:
Derald D. Woods
2019-05-27 21:22:00 -05:00
committed by Tom Rini
parent e74e9f620a
commit 9adaa039b6
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/musb-new/omap2430.c
View File

@@ -215,11 +215,13 @@ static int omap2430_musb_probe(struct udevice *dev)
{ {
#ifdef CONFIG_USB_MUSB_HOST #ifdef CONFIG_USB_MUSB_HOST
struct musb_host_data *host = dev_get_priv(dev); struct musb_host_data *host = dev_get_priv(dev);
#else
struct musb *musbp;
#endif #endif
struct omap2430_musb_platdata *platdata = dev_get_platdata(dev); struct omap2430_musb_platdata *platdata = dev_get_platdata(dev);
struct usb_bus_priv *priv = dev_get_uclass_priv(dev); struct usb_bus_priv *priv = dev_get_uclass_priv(dev);
struct omap_musb_board_data *otg_board_data; struct omap_musb_board_data *otg_board_data;
int ret; int ret = 0;
void *base = dev_read_addr_ptr(dev); void *base = dev_read_addr_ptr(dev);
priv->desc_before_addr = true; priv->desc_before_addr = true;
@@ -236,9 +238,11 @@ static int omap2430_musb_probe(struct udevice *dev)
ret = musb_lowlevel_init(host); ret = musb_lowlevel_init(host);
#else #else
ret = musb_register(&platdata->plat, musbp = musb_register(&platdata->plat,
(struct device *)otg_board_data, (struct device *)otg_board_data,
platdata->base); platdata->base);
if (IS_ERR_OR_NULL(musbp))
return -EINVAL;
#endif #endif
return ret; return ret;
} }