Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[karo-tx-linux.git] / drivers / usb / core / message.c

diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 444d30e3a78b7f2fb91fcda9156d82401414a67d..e7ee1e451660a4c9a29cee88dc9c97f3aec534c0 100644 (file)
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -252,7 +252,7 @@ static void sg_clean(struct usb_sg_request *io)
 {
        if (io->urbs) {
                while (io->entries--)
-                       usb_free_urb(io->urbs [io->entries]);
+                       usb_free_urb(io->urbs[io->entries]);
                kfree(io->urbs);
                io->urbs = NULL;
        }
@@ -300,10 +300,10 @@ static void sg_complete(struct urb *urb)
                 */
                spin_unlock(&io->lock);
                for (i = 0, found = 0; i < io->entries; i++) {
-                       if (!io->urbs [i] || !io->urbs [i]->dev)
+                       if (!io->urbs[i] || !io->urbs[i]->dev)
                                continue;
                        if (found) {
-                               retval = usb_unlink_urb(io->urbs [i]);
+                               retval = usb_unlink_urb(io->urbs[i]);
                                if (retval != -EINPROGRESS &&
                                    retval != -ENODEV &&
                                    retval != -EBUSY &&
@@ -311,7 +311,7 @@ static void sg_complete(struct urb *urb)
                                        dev_err(&io->dev->dev,
                                                "%s, unlink --> %d\n",
                                                __func__, retval);
-                       } else if (urb == io->urbs [i])
+                       } else if (urb == io->urbs[i])
                                found = 1;
                }
                spin_lock(&io->lock);
@@ -379,7 +379,7 @@ int usb_sg_init(struct usb_sg_request *io, struct usb_device *dev,
        }
 
        /* initialize all the urbs we'll use */
-       io->urbs = kmalloc(io->entries * sizeof *io->urbs, mem_flags);
+       io->urbs = kmalloc(io->entries * sizeof(*io->urbs), mem_flags);
        if (!io->urbs)
                goto nomem;
 
@@ -511,7 +511,7 @@ void usb_sg_wait(struct usb_sg_request *io)
                int retval;
 
                io->urbs[i]->dev = io->dev;
-               retval = usb_submit_urb(io->urbs [i], GFP_ATOMIC);
+               retval = usb_submit_urb(io->urbs[i], GFP_ATOMIC);
 
                /* after we submit, let completions or cancelations fire;
                 * we handshake using io->status.
@@ -586,9 +586,9 @@ void usb_sg_cancel(struct usb_sg_request *io)
                for (i = 0; i < io->entries; i++) {
                        int retval;
 
-                       if (!io->urbs [i]->dev)
+                       if (!io->urbs[i]->dev)
                                continue;
-                       retval = usb_unlink_urb(io->urbs [i]);
+                       retval = usb_unlink_urb(io->urbs[i]);
                        if (retval != -EINPROGRESS
                                        && retval != -ENODEV
                                        && retval != -EBUSY