File 0014-usb-usb_submit_int_msg-usb_int_msg.patch of Package u-boot-turrisomnia

Overview Repositories Revisions Requests Users Attributes Meta

File 0014-usb-usb_submit_int_msg-usb_int_msg.patch of Package u-boot-turrisomnia

From 3ccad2e36b435287b575aa2b484df424a1ff2137 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Sun, 18 Aug 2019 10:55:25 +0200
Subject: [PATCH] usb: usb_submit_int_msg -> usb_int_msg

This aligns naming with usb_bulk_msg and usb_control_msg.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
(cherry picked from commit fdd135bf8ea475b61f3e771cf67e840544c415ee)
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
---
 common/usb.c     | 4 ++--
 common/usb_kbd.c | 8 ++++----
 include/usb.h    | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/usb.c b/common/usb.c
index b70f614d24..14b2752139 100644
--- a/common/usb.c
+++ b/common/usb.c
@@ -194,8 +194,8 @@ int usb_disable_asynch(int disable)
 /*
  * submits an Interrupt Message
  */
-int usb_submit_int_msg(struct usb_device *dev, unsigned long pipe,
-			void *buffer, int transfer_len, int interval)
+int usb_int_msg(struct usb_device *dev, unsigned long pipe,
+		void *buffer, int transfer_len, int interval)
 {
 	return submit_int_msg(dev, pipe, buffer, transfer_len, interval);
 }
diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index b793dbe1f6..8d518d3fc8 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -317,8 +317,8 @@ static inline void usb_kbd_poll_for_event(struct usb_device *dev)
 	struct usb_kbd_pdata *data = dev->privptr;
 
 	/* Submit a interrupt transfer request */
-	if (usb_submit_int_msg(dev, data->intpipe, &data->new[0],
-			       data->intpktsize, data->intinterval) >= 0)
+	if (usb_int_msg(dev, data->intpipe, &data->new[0],
+			data->intpktsize, data->intinterval) >= 0)
 		usb_kbd_irq_worker(dev);
 #elif defined(CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP) || \
       defined(CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE)
@@ -481,8 +481,8 @@ static int usb_kbd_probe_dev(struct usb_device *dev, unsigned int ifnum)
 	if (usb_get_report(dev, iface->desc.bInterfaceNumber,
 			   1, 0, data->new, USB_KBD_BOOT_REPORT_SIZE) < 0) {
 #else
-	if (usb_submit_int_msg(dev, data->intpipe, data->new, data->intpktsize,
-			       data->intinterval) < 0) {
+	if (usb_int_msg(dev, data->intpipe, data->new, data->intpktsize,
+			data->intinterval) < 0) {
 #endif
 		printf("Failed to get keyboard state from device %04x:%04x\n",
 		       dev->descriptor.idVendor, dev->descriptor.idProduct);
diff --git a/include/usb.h b/include/usb.h
index 420a30e49f..0d38d8333a 100644
--- a/include/usb.h
+++ b/include/usb.h
@@ -261,8 +261,8 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe,
 			void *data, unsigned short size, int timeout);
 int usb_bulk_msg(struct usb_device *dev, unsigned int pipe,
 			void *data, int len, int *actual_length, int timeout);
-int usb_submit_int_msg(struct usb_device *dev, unsigned long pipe,
-			void *buffer, int transfer_len, int interval);
+int usb_int_msg(struct usb_device *dev, unsigned long pipe,
+		void *buffer, int transfer_len, int interval);
 int usb_disable_asynch(int disable);
 int usb_maxpacket(struct usb_device *dev, unsigned long pipe);
 int usb_get_configuration_no(struct usb_device *dev, int cfgno,

Places

File 0014-usb-usb_submit_int_msg-usb_int_msg.patch of Package u-boot-turrisomnia

Places