From 8802f56349eef1eedaf12238f84810d0691aaf34 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 17 Jun 2015 21:33:48 +0200 Subject: 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 Acked-by: Simon Glass --- drivers/usb/musb-new/musb_uboot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/usb/musb-new') diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c index d1ee5f8d06..1bf676c589 100644 --- a/drivers/usb/musb-new/musb_uboot.c +++ b/drivers/usb/musb-new/musb_uboot.c @@ -180,7 +180,7 @@ void *poll_int_queue(struct usb_device *dev, struct int_queue *queue) return NULL; /* URB still pending */ } -int usb_reset_root_port(void) +int usb_reset_root_port(struct usb_device *dev) { void *mbase = host->mregs; u8 power; @@ -232,7 +232,7 @@ int usb_lowlevel_init(int index, enum usb_init_type init, void **controller) if (get_timer(0) >= timeout) return -ENODEV; - usb_reset_root_port(); + usb_reset_root_port(NULL); host->is_active = 1; hcd.hcd_priv = host; -- cgit v1.2.3