summaryrefslogtreecommitdiffstats
path: root/configs/platform-v7a/patches/barebox-2020.01.0/0002-usb-Make-timeout-unit-clear.patch
diff options
context:
space:
mode:
Diffstat (limited to 'configs/platform-v7a/patches/barebox-2020.01.0/0002-usb-Make-timeout-unit-clear.patch')
-rw-r--r--configs/platform-v7a/patches/barebox-2020.01.0/0002-usb-Make-timeout-unit-clear.patch81
1 files changed, 0 insertions, 81 deletions
diff --git a/configs/platform-v7a/patches/barebox-2020.01.0/0002-usb-Make-timeout-unit-clear.patch b/configs/platform-v7a/patches/barebox-2020.01.0/0002-usb-Make-timeout-unit-clear.patch
deleted file mode 100644
index 521c8a1..0000000
--- a/configs/platform-v7a/patches/barebox-2020.01.0/0002-usb-Make-timeout-unit-clear.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From: Sascha Hauer <s.hauer@pengutronix.de>
-Date: Fri, 20 Dec 2019 09:33:43 +0100
-Subject: [PATCH] usb: Make timeout unit clear
-
-The usb_*_msg() functions take a timeout parameter. Make clear which
-unit is expected by adding a _ms suffix to the variable name.
-
-Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
----
- drivers/usb/core/usb.c | 8 ++++----
- include/usb/usb.h | 8 ++++----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
-index d29cd1328bbb..ad3bacf23655 100644
---- a/drivers/usb/core/usb.c
-+++ b/drivers/usb/core/usb.c
-@@ -593,7 +593,7 @@ int usb_submit_int_msg(struct usb_device *dev, unsigned long pipe,
- int usb_control_msg(struct usb_device *dev, unsigned int pipe,
- unsigned char request, unsigned char requesttype,
- unsigned short value, unsigned short index,
-- void *data, unsigned short size, int timeout)
-+ void *data, unsigned short size, int timeout_ms)
- {
- struct usb_host *host = dev->host;
- int ret;
-@@ -615,7 +615,7 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe,
- dev->status = USB_ST_NOT_PROC; /*not yet processed */
-
- ret = host->submit_control_msg(dev, pipe, data, size, setup_packet,
-- timeout);
-+ timeout_ms);
-
- usb_host_release(host);
-
-@@ -631,7 +631,7 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe,
- * synchronous behavior
- */
- int usb_bulk_msg(struct usb_device *dev, unsigned int pipe,
-- void *data, int len, int *actual_length, int timeout)
-+ void *data, int len, int *actual_length, int timeout_ms)
- {
- struct usb_host *host = dev->host;
- int ret;
-@@ -644,7 +644,7 @@ int usb_bulk_msg(struct usb_device *dev, unsigned int pipe,
- return ret;
-
- dev->status = USB_ST_NOT_PROC; /* not yet processed */
-- ret = host->submit_bulk_msg(dev, pipe, data, len, timeout);
-+ ret = host->submit_bulk_msg(dev, pipe, data, len, timeout_ms);
-
- usb_host_release(host);
-
-diff --git a/include/usb/usb.h b/include/usb/usb.h
-index d39de71aff95..95dedfd5b739 100644
---- a/include/usb/usb.h
-+++ b/include/usb/usb.h
-@@ -140,9 +140,9 @@ struct usb_host {
- int (*init)(struct usb_host *);
- int (*exit)(struct usb_host *);
- int (*submit_bulk_msg)(struct usb_device *dev, unsigned long pipe,
-- void *buffer, int transfer_len, int timeout);
-+ void *buffer, int transfer_len, int timeout_ms);
- int (*submit_control_msg)(struct usb_device *dev, unsigned long pipe, void *buffer,
-- int transfer_len, struct devrequest *setup, int timeout);
-+ int transfer_len, struct devrequest *setup, int timeout_ms);
- int (*submit_int_msg)(struct usb_device *dev, unsigned long pipe, void *buffer,
- int transfer_len, int interval);
- void (*usb_event_poll)(void);
-@@ -167,9 +167,9 @@ int usb_set_idle(struct usb_device *dev, int ifnum, int duration,
- int usb_control_msg(struct usb_device *dev, unsigned int pipe,
- unsigned char request, unsigned char requesttype,
- unsigned short value, unsigned short index,
-- void *data, unsigned short size, int timeout);
-+ void *data, unsigned short size, int timeout_ms);
- int usb_bulk_msg(struct usb_device *dev, unsigned int pipe,
-- void *data, int len, int *actual_length, int timeout);
-+ void *data, int len, int *actual_length, int timeout_ms);
- int usb_submit_int_msg(struct usb_device *dev, unsigned long pipe,
- void *buffer, int transfer_len, int interval);
- int usb_maxpacket(struct usb_device *dev, unsigned long pipe);