summaryrefslogtreecommitdiffstats
path: root/include/usb.h
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2015-06-17 21:33:48 +0200
committerSimon Glass <sjg@chromium.org>2015-07-21 17:39:35 -0600
commit8802f56349eef1eedaf12238f84810d0691aaf34 (patch)
treebfc31d7d21a595b0b37e7de2fbb5cc84713e2aa4 /include/usb.h
parent682c9f8dfc47df94df061df58345d84f69be0a34 (diff)
downloadblackbird-obmc-uboot-8802f56349eef1eedaf12238f84810d0691aaf34.tar.gz
blackbird-obmc-uboot-8802f56349eef1eedaf12238f84810d0691aaf34.zip
usb: Add an usb_device parameter to usb_reset_root_port
Add an usb_device parameter to usb_reset_root_port so that it knows which root-port it is resetting. This is necessary for proper device-model support for usb_reset_root_port. Also remove a duplicate declaration of usb_reset_root_port() from usb.h . Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include/usb.h')
-rw-r--r--include/usb.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/include/usb.h b/include/usb.h
index 8a71e28253..2bb6a063c6 100644
--- a/include/usb.h
+++ b/include/usb.h
@@ -175,9 +175,9 @@ int usb_lowlevel_init(int index, enum usb_init_type init, void **controller);
int usb_lowlevel_stop(int index);
#if defined(CONFIG_MUSB_HOST) || defined(CONFIG_DM_USB)
-int usb_reset_root_port(void);
+int usb_reset_root_port(struct usb_device *dev);
#else
-#define usb_reset_root_port()
+#define usb_reset_root_port(dev)
#endif
int submit_bulk_msg(struct usb_device *dev, unsigned long pipe,
@@ -710,10 +710,6 @@ struct dm_usb_ops {
#define usb_get_ops(dev) ((struct dm_usb_ops *)(dev)->driver->ops)
#define usb_get_emul_ops(dev) ((struct dm_usb_ops *)(dev)->driver->ops)
-#ifdef CONFIG_MUSB_HOST
-int usb_reset_root_port(void);
-#endif
-
/**
* usb_get_dev_index() - look up a device index number
*
OpenPOWER on IntegriCloud