[PATCH] USB set-bit takes a long tweaks

This removes gratuitous & operators in front of USB's
dev->bus->devmap.devicemap and state->unitbitmap, for bitops.

This just makes it so it doesn't warn when set_bit et. al take a
long...

No object code changes,
Rusty.

diff --git a/drivers/usb/class/audio.c b/drivers/usb/class/audio.c
index ba07abcf9d8d2d541d7b85e8c2a63ce0e7ed44b5..b02a3aee8489dafd7a9637afe4220264d6679832 100644 (file)
--- a/drivers/usb/class/audio.c
+++ b/drivers/usb/class/audio.c
@@ -3523,7 +3523,7 @@ static void usb_audio_recurseunit(struct consmixstate *state, unsigned char unit
        unsigned char *p1;
        unsigned int i, j;
 
-       if (test_and_set_bit(unitid, &state->unitbitmap)) {
+       if (test_and_set_bit(unitid, state->unitbitmap)) {
                printk(KERN_INFO "usbaudio: mixer path revisits unit %d\n", unitid);
                return;
        }
@@ -3613,7 +3613,7 @@ static void usb_audio_constructmixer(struct usb_audio_state *s, unsigned char *b
        state.buffer = buffer;
        state.buflen = buflen;
        state.ctrlif = ctrlif;
-       set_bit(oterm[3], &state.unitbitmap);  /* mark terminal ID as visited */
+       set_bit(oterm[3], state.unitbitmap);  /* mark terminal ID as visited */
        printk(KERN_DEBUG "usbaudio: constructing mixer for Terminal %u type 0x%04x\n",
               oterm[3], oterm[4] | (oterm[5] << 8));
        usb_audio_recurseunit(&state, oterm[7]);

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 737d6120d8b73700bf9abe091ce78ee7d971c6ba..3d7efd659d75325573bec4c86d2e0908a4c0b1c8 100644 (file)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1122,7 +1122,7 @@ int usb_reset_device(struct usb_device *dev)
                                        dev->devpath,
                                        sizeof(dev->descriptor), ret);
         
-                       clear_bit(dev->devnum, &dev->bus->devmap.devicemap);
+                       clear_bit(dev->devnum, dev->bus->devmap.devicemap);
                        dev->devnum = -1;
                        return -EIO;
                }
@@ -1131,7 +1131,7 @@ int usb_reset_device(struct usb_device *dev)
                if (ret < 0) {
                        err("unable to get configuration (error=%d)", ret);
                        usb_destroy_configuration(dev);
-                       clear_bit(dev->devnum, &dev->bus->devmap.devicemap);
+                       clear_bit(dev->devnum, dev->bus->devmap.devicemap);
                        dev->devnum = -1;
                        return 1;
                }

diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index bb88b24e43ee0b465a02f97190431da54f3846f8..8fe9219e66967aada7efdbcc1a9288272eb55858 100644 (file)
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -1784,7 +1784,7 @@ void usb_disconnect(struct usb_device **pdev)
 
        /* Free the device number and remove the /proc/bus/usb entry */
        if (dev->devnum > 0) {
-               clear_bit(dev->devnum, &dev->bus->devmap.devicemap);
+               clear_bit(dev->devnum, dev->bus->devmap.devicemap);
                usbfs_remove_device(dev);
                put_device(&dev->dev);
        }
@@ -2434,7 +2434,7 @@ int usb_new_device(struct usb_device *dev)
        if (err < 0) {
                err("USB device not accepting new address=%d (error=%d)",
                        dev->devnum, err);
-               clear_bit(dev->devnum, &dev->bus->devmap.devicemap);
+               clear_bit(dev->devnum, dev->bus->devmap.devicemap);
                dev->devnum = -1;
                return 1;
        }
@@ -2447,7 +2447,7 @@ int usb_new_device(struct usb_device *dev)
                        err("USB device not responding, giving up (error=%d)", err);
                else
                        err("USB device descriptor short read (expected %i, got %i)", 8, err);
-               clear_bit(dev->devnum, &dev->bus->devmap.devicemap);
+               clear_bit(dev->devnum, dev->bus->devmap.devicemap);
                dev->devnum = -1;
                return 1;
        }
@@ -2462,7 +2462,7 @@ int usb_new_device(struct usb_device *dev)
                        err("USB device descriptor short read (expected %Zi, got %i)",
                                sizeof(dev->descriptor), err);
        
-               clear_bit(dev->devnum, &dev->bus->devmap.devicemap);
+               clear_bit(dev->devnum, dev->bus->devmap.devicemap);
                dev->devnum = -1;
                return 1;
        }
@@ -2471,7 +2471,7 @@ int usb_new_device(struct usb_device *dev)
        if (err < 0) {
                err("unable to get device %d configuration (error=%d)",
                        dev->devnum, err);
-               clear_bit(dev->devnum, &dev->bus->devmap.devicemap);
+               clear_bit(dev->devnum, dev->bus->devmap.devicemap);
                dev->devnum = -1;
                return 1;
        }
@@ -2481,7 +2481,7 @@ int usb_new_device(struct usb_device *dev)
        if (err) {
                err("failed to set device %d default configuration (error=%d)",
                        dev->devnum, err);
-               clear_bit(dev->devnum, &dev->bus->devmap.devicemap);
+               clear_bit(dev->devnum, dev->bus->devmap.devicemap);
                dev->devnum = -1;
                return 1;
        }