Until yet usb_**_msg() APIs don't contain the string 'submit'. Rename it to make things uniform. This is also helping while adding a host translational layer wherein we are using usb_submit_**_msg string to name APIs.
Signed-off-by: Vivek Gautam gautam.vivek@samsung.com --- common/usb.c | 4 ++-- common/usb_kbd.c | 4 ++-- common/usb_storage.c | 2 +- include/usb.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/usb.c b/common/usb.c index 32e15cd..849df27 100644 --- a/common/usb.c +++ b/common/usb.c @@ -162,10 +162,10 @@ int usb_disable_asynch(int disable) /* * submits an Interrupt Message */ -int usb_submit_int_msg(struct usb_device *dev, unsigned long pipe, +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); + return usb_submit_int_msg(dev, pipe, buffer, transfer_len, interval); }
/* diff --git a/common/usb_kbd.c b/common/usb_kbd.c index ecc3085..d5d33a5 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -313,7 +313,7 @@ static inline void usb_kbd_poll_for_event(struct usb_device *dev) struct usb_kbd_pdata *data = dev->privptr;
/* Submit a interrupt transfer request */ - usb_submit_int_msg(dev, data->intpipe, &data->new[0], data->intpktsize, + usb_int_msg(dev, data->intpipe, &data->new[0], data->intpktsize, data->intinterval);
usb_kbd_irq_worker(dev); @@ -458,7 +458,7 @@ static int usb_kbd_probe(struct usb_device *dev, unsigned int ifnum) data->intinterval); if (!data->intq) { #else - if (usb_submit_int_msg(dev, data->intpipe, data->new, data->intpktsize, + 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", diff --git a/common/usb_storage.c b/common/usb_storage.c index 1411737..7094eea 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -599,7 +599,7 @@ static int usb_stor_CBI_get_status(ccb *srb, struct us_data *us) int timeout;
us->ip_wanted = 1; - submit_int_msg(us->pusb_dev, us->irqpipe, + usb_int_msg(us->pusb_dev, us->irqpipe, (void *) &us->ip_data, us->irqmaxp, us->irqinterval); timeout = 1000; while (timeout--) { diff --git a/include/usb.h b/include/usb.h index a8fee0b..d1576b2 100644 --- a/include/usb.h +++ b/include/usb.h @@ -252,7 +252,7 @@ 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, +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);