OSDN Git Service

USB: core: Fix compiler warnings in devio.c
authorAlan Stern <stern@rowland.harvard.edu>
Tue, 25 Jun 2019 20:00:26 +0000 (16:00 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Jun 2019 02:28:09 +0000 (10:28 +0800)
In the current kernel, devio.c generates a number of compiler warnings
about taking the address of a member of a packed structure.  The
warnings all look like this one:

drivers/usb/core/devio.c: In function ‘proc_do_submiturb’:
drivers/usb/core/devio.c:1489:43: warning: taking address of packed member of ‘struct usb_ctrlrequest’ may result in an unaligned pointer value [-Waddress-of-packed-member]
 1489 |   if (uurb->buffer_length < (le16_to_cpup(&dr->wLength) + 8)) {
      |                                           ^~~~~~~~~~~~

These warnings can easily be eliminated by changing various
le16_to_cpup() calls to use le16_to_cpu() instead.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/core/devio.c

index 0100a54..a951ce6 100644 (file)
@@ -1510,15 +1510,15 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb
                        ret = -EFAULT;
                        goto error;
                }
-               if (uurb->buffer_length < (le16_to_cpup(&dr->wLength) + 8)) {
+               if (uurb->buffer_length < (le16_to_cpu(dr->wLength) + 8)) {
                        ret = -EINVAL;
                        goto error;
                }
                ret = check_ctrlrecip(ps, dr->bRequestType, dr->bRequest,
-                                     le16_to_cpup(&dr->wIndex));
+                                     le16_to_cpu(dr->wIndex));
                if (ret)
                        goto error;
-               uurb->buffer_length = le16_to_cpup(&dr->wLength);
+               uurb->buffer_length = le16_to_cpu(dr->wLength);
                uurb->buffer += 8;
                if ((dr->bRequestType & USB_DIR_IN) && uurb->buffer_length) {
                        is_in = 1;
@@ -1533,9 +1533,9 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb
                        "bRequest=%02x wValue=%04x "
                        "wIndex=%04x wLength=%04x\n",
                        dr->bRequestType, dr->bRequest,
-                       __le16_to_cpup(&dr->wValue),
-                       __le16_to_cpup(&dr->wIndex),
-                       __le16_to_cpup(&dr->wLength));
+                       __le16_to_cpu(dr->wValue),
+                       __le16_to_cpu(dr->wIndex),
+                       __le16_to_cpu(dr->wLength));
                u = sizeof(struct usb_ctrlrequest);
                break;