projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
[oweals/u-boot.git]
/
drivers
/
usb
/
host
/
usb-uclass.c
diff --git
a/drivers/usb/host/usb-uclass.c
b/drivers/usb/host/usb-uclass.c
index 8a9f810bf81c8c067096cb76ab2e68ff72c36801..611ea97a724929903d3ba028b53a42f894c223be 100644
(file)
--- a/
drivers/usb/host/usb-uclass.c
+++ b/
drivers/usb/host/usb-uclass.c
@@
-1,10
+1,9
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2015 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
*
* usb_match_device() modified from Linux kernel v4.0.
/*
* (C) Copyright 2015 Google, Inc
* Written by Simon Glass <sjg@chromium.org>
*
* usb_match_device() modified from Linux kernel v4.0.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
@@
-16,8
+15,6
@@
#include <dm/lists.h>
#include <dm/uclass-internal.h>
#include <dm/lists.h>
#include <dm/uclass-internal.h>
-DECLARE_GLOBAL_DATA_PTR;
-
extern bool usb_started; /* flag for the started/stopped USB status */
static bool asynch_allowed;
extern bool usb_started; /* flag for the started/stopped USB status */
static bool asynch_allowed;
@@
-193,22
+190,7
@@
int usb_stop(void)
err = ret;
}
}
err = ret;
}
}
-#ifdef CONFIG_BLK
- ret = blk_unbind_all(IF_TYPE_USB);
- if (ret && !err)
- err = ret;
-#endif
-#ifdef CONFIG_SANDBOX
- struct udevice *dev;
- /* Reset all enulation devices */
- ret = uclass_get(UCLASS_USB_EMUL, &uc);
- if (ret)
- return ret;
-
- uclass_foreach_dev(dev, uc)
- usb_emul_reset(dev);
-#endif
#ifdef CONFIG_USB_STORAGE
usb_stor_reset();
#endif
#ifdef CONFIG_USB_STORAGE
usb_stor_reset();
#endif