projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
efi_loader: remove superfluous check in efi_setup_loaded_image()
[oweals/u-boot.git]
/
common
/
usb_hub.c
diff --git
a/common/usb_hub.c
b/common/usb_hub.c
index 024dadb27741f4f3953f337b85ed578f1797c165..33aaeb8e4452a030b103781af0a97dd4115c4f76 100644
(file)
--- a/
common/usb_hub.c
+++ b/
common/usb_hub.c
@@
-1,3
+1,4
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Most of this source has been derived from the Linux USB
* project:
/*
* Most of this source has been derived from the Linux USB
* project:
@@
-13,8
+14,6
@@
*
* Adapted for U-Boot:
* (C) Copyright 2001 Denis Peter, MPL AG Switzerland
*
* Adapted for U-Boot:
* (C) Copyright 2001 Denis Peter, MPL AG Switzerland
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/****************************************************************************
*/
/****************************************************************************
@@
-37,8
+36,6
@@
#endif
#include <asm/unaligned.h>
#endif
#include <asm/unaligned.h>
-DECLARE_GLOBAL_DATA_PTR;
-
#include <usb.h>
#define USB_BUFSIZ 512
#include <usb.h>
#define USB_BUFSIZ 512
@@
-67,7
+64,7
@@
static inline bool usb_hub_is_superspeed(struct usb_device *hdev)
return hdev->descriptor.bDeviceProtocol == 3;
}
return hdev->descriptor.bDeviceProtocol == 3;
}
-#if
def CONFIG_DM_USB
+#if
CONFIG_IS_ENABLED(DM_USB)
bool usb_hub_is_root_hub(struct udevice *hub)
{
if (device_get_uclass_id(hub->parent) != UCLASS_USB_HUB)
bool usb_hub_is_root_hub(struct udevice *hub)
{
if (device_get_uclass_id(hub->parent) != UCLASS_USB_HUB)
@@
-128,7
+125,7
@@
int usb_get_port_status(struct usb_device *dev, int port, void *data)
USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_PORT, 0, port,
data, sizeof(struct usb_port_status), USB_CNTL_TIMEOUT);
USB_REQ_GET_STATUS, USB_DIR_IN | USB_RT_PORT, 0, port,
data, sizeof(struct usb_port_status), USB_CNTL_TIMEOUT);
-#if
def CONFIG_DM_USB
+#if
CONFIG_IS_ENABLED(DM_USB)
if (ret < 0)
return ret;
if (ret < 0)
return ret;
@@
-212,7
+209,7
@@
static void usb_hub_power_on(struct usb_hub_device *hub)
max(100, (int)pgood_delay) + 1000);
}
max(100, (int)pgood_delay) + 1000);
}
-#if
ndef CONFIG_DM_USB
+#if
!CONFIG_IS_ENABLED(DM_USB)
static struct usb_hub_device hub_dev[USB_MAX_HUB];
static int usb_hub_index;
static struct usb_hub_device hub_dev[USB_MAX_HUB];
static int usb_hub_index;
@@
-276,7
+273,7
@@
static int usb_hub_port_reset(struct usb_device *dev, int port,
unsigned short portstatus, portchange;
int delay = HUB_SHORT_RESET_TIME; /* start with short reset delay */
unsigned short portstatus, portchange;
int delay = HUB_SHORT_RESET_TIME; /* start with short reset delay */
-#if
def CONFIG_DM_USB
+#if
CONFIG_IS_ENABLED(DM_USB)
debug("%s: resetting '%s' port %d...\n", __func__, dev->dev->name,
port + 1);
#else
debug("%s: resetting '%s' port %d...\n", __func__, dev->dev->name,
port + 1);
#else
@@
-397,7
+394,7
@@
int usb_hub_port_connect_change(struct usb_device *dev, int port)
break;
}
break;
}
-#if
def CONFIG_DM_USB
+#if
CONFIG_IS_ENABLED(DM_USB)
struct udevice *child;
ret = usb_scan_device(dev->dev, port + 1, speed, &child);
struct udevice *child;
ret = usb_scan_device(dev->dev, port + 1, speed, &child);
@@
-607,7
+604,7
@@
static struct usb_hub_device *usb_get_hub_device(struct usb_device *dev)
{
struct usb_hub_device *hub;
{
struct usb_hub_device *hub;
-#if
ndef CONFIG_DM_USB
+#if
!CONFIG_IS_ENABLED(DM_USB)
/* "allocate" Hub device */
hub = usb_hub_allocate();
#else
/* "allocate" Hub device */
hub = usb_hub_allocate();
#else
@@
-625,7
+622,7
@@
static int usb_hub_configure(struct usb_device *dev)
short hubCharacteristics;
struct usb_hub_descriptor *descriptor;
struct usb_hub_device *hub;
short hubCharacteristics;
struct usb_hub_descriptor *descriptor;
struct usb_hub_device *hub;
-
__maybe_unused
struct usb_hub_status *hubsts;
+ struct usb_hub_status *hubsts;
int ret;
hub = usb_get_hub_device(dev);
int ret;
hub = usb_get_hub_device(dev);
@@
-779,9
+776,7
@@
static int usb_hub_configure(struct usb_device *dev)
return ret;
}
return ret;
}
-#ifdef DEBUG
hubsts = (struct usb_hub_status *)buffer;
hubsts = (struct usb_hub_status *)buffer;
-#endif
debug("get_hub_status returned status %X, change %X\n",
le16_to_cpu(hubsts->wHubStatus),
debug("get_hub_status returned status %X, change %X\n",
le16_to_cpu(hubsts->wHubStatus),
@@
-793,7
+788,7
@@
static int usb_hub_configure(struct usb_device *dev)
(le16_to_cpu(hubsts->wHubStatus) & HUB_STATUS_OVERCURRENT) ? \
"" : "no ");
(le16_to_cpu(hubsts->wHubStatus) & HUB_STATUS_OVERCURRENT) ? \
"" : "no ");
-#if
def CONFIG_DM_USB
+#if
CONFIG_IS_ENABLED(DM_USB)
/*
* Update USB host controller's internal representation of this hub
* after the hub descriptor is fetched.
/*
* Update USB host controller's internal representation of this hub
* after the hub descriptor is fetched.
@@
-935,7
+930,7
@@
int usb_hub_probe(struct usb_device *dev, int ifnum)
return ret;
}
return ret;
}
-#if
def CONFIG_DM_USB
+#if
CONFIG_IS_ENABLED(DM_USB)
int usb_hub_scan(struct udevice *hub)
{
struct usb_device *udev = dev_get_parent_priv(hub);
int usb_hub_scan(struct udevice *hub)
{
struct usb_device *udev = dev_get_parent_priv(hub);