diff options
| author | Sven Schwermer | 2018-11-21 08:43:56 +0100 |
|---|---|---|
| committer | Marek Vasut | 2018-11-26 21:19:03 +0100 |
| commit | fd09c205fc57b90a782cac33449ef172575d0a8c (patch) | |
| tree | b23d462a78db88ec589c50d769fa6522b3f16c63 /drivers/usb/gadget | |
| parent | ab5817027f9b4fce25f5f2a3e20577ac55bbd7e0 (diff) | |
usb: s/CONFIG_DM_USB/CONFIG_IS_ENABLED(DM_USB)/
This allows to disable the USB driver model in SPL because it checks
the CONFIG_SPL_DM_USB variable for SPL builds. Nothing changes for
regular non-SPL builds.
Signed-off-by: Sven Schwermer <sven@svenschwermer.de>
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/ci_udc.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/ether.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c index 0a84f6850d1..bd596ce9773 100644 --- a/drivers/usb/gadget/ci_udc.c +++ b/drivers/usb/gadget/ci_udc.c @@ -1015,7 +1015,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) if (driver->speed != USB_SPEED_FULL && driver->speed != USB_SPEED_HIGH) return -EINVAL; -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) ret = usb_setup_ehci_gadget(&controller.ctrl); #else ret = usb_lowlevel_init(0, USB_INIT_DEVICE, (void **)&controller.ctrl); diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 90ef1f055f7..193583b437c 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -100,7 +100,7 @@ struct eth_dev { struct usb_gadget *gadget; struct usb_request *req; /* for control responses */ struct usb_request *stat_req; /* for cdc & rndis status */ -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) struct udevice *usb_udev; #endif @@ -2337,7 +2337,7 @@ fail: /*-------------------------------------------------------------------------*/ -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) int dm_usb_init(struct eth_dev *e_dev) { struct udevice *dev = NULL; @@ -2362,7 +2362,7 @@ static int _usb_eth_init(struct ether_priv *priv) unsigned long ts; unsigned long timeout = USB_CONNECT_TIMEOUT; -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) if (dm_usb_init(dev)) { pr_err("USB ether not found\n"); return -ENODEV; @@ -2541,7 +2541,7 @@ void _usb_eth_halt(struct ether_priv *priv) } usb_gadget_unregister_driver(&priv->eth_driver); -#ifndef CONFIG_DM_USB +#if !CONFIG_IS_ENABLED(DM_USB) board_usb_cleanup(0, USB_INIT_DEVICE); #endif } |