diff options
| author | Michal Suchanek <msuchanek@suse.de> | 2019-08-18 10:55:25 +0200 |
|---|---|---|
| committer | marex <marex@chi.lan> | 2019-09-11 10:11:29 +0200 |
| commit | fdd135bf8ea475b61f3e771cf67e840544c415ee (patch) | |
| tree | 9734296168efc807a8e600aa6dbeb41987e4ca25 | |
| parent | 3e816a2424c428f452f2003aff105511dc0cd9d4 (diff) | |
| download | u-boot-fdd135bf8ea475b61f3e771cf67e840544c415ee.tar.gz u-boot-fdd135bf8ea475b61f3e771cf67e840544c415ee.tar.xz u-boot-fdd135bf8ea475b61f3e771cf67e840544c415ee.zip | |
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>
| -rw-r--r-- | common/usb.c | 4 | ||||
| -rw-r--r-- | common/usb_kbd.c | 8 | ||||
| -rw-r--r-- | 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 e0c1e6d2b7..ebfd972bea 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -340,8 +340,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) @@ -504,8 +504,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, |