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>

diff --git a/common/usb.c b/common/usb.c
index b70f614d244f56a2ea2c29b007f45158dc92818c..14b27521395c257c47c2091ec4910c36c934e1bf 100644 (file)
--- 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 e0c1e6d2b7965908b4a2c338a6951676519f362a..ebfd972bea0371b0c6afdd995caa9e9693f4f75b 100644 (file)
--- 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 420a30e49fa157b259da5794a72b45fecb1d1af2..0d38d8333a98567734247e187f6ac049d6605272 100644 (file)
--- 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,