]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
staging: vt6656: use set_bit to set flags
authorMalcolm Priestley <tvboxspy@gmail.com>
Thu, 24 Jul 2014 20:13:17 +0000 (21:13 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 24 Jul 2014 22:09:59 +0000 (15:09 -0700)
Replacing MP_SET_FLAG

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/device.h
drivers/staging/vt6656/main_usb.c

index fd7105ea1f66f56a2de406266a5b1a34faf09eae..5ac80d8df4712762e2f9702051e148db75830a2a 100644 (file)
@@ -402,7 +402,6 @@ struct vnt_private {
                (uVar)++;                               \
 }
 
-#define MP_SET_FLAG(_M, _F)             ((_M)->flags |= (_F))
 #define MP_CLEAR_FLAG(_M, _F)            ((_M)->flags &= ~(_F))
 #define MP_TEST_FLAGS(_M, _F)            (((_M)->flags & (_F)) == (_F))
 
index 87feba52d240958c4deb94d3a01c5ce2516a88e7..7798221c9ba51954d33d53c6f7a7b9bcb25ef631 100644 (file)
@@ -596,7 +596,7 @@ static void vnt_stop(struct ieee80211_hw *hw)
 
        ieee80211_stop_queues(hw);
 
-       MP_SET_FLAG(priv, DEVICE_FLAGS_DISCONNECTED);
+       set_bit(DEVICE_FLAGS_DISCONNECTED, &priv->flags);
 
        cancel_delayed_work_sync(&priv->run_command_work);
 
@@ -1051,7 +1051,7 @@ static void vt6656_disconnect(struct usb_interface *intf)
        usb_set_intfdata(intf, NULL);
        usb_put_dev(interface_to_usbdev(intf));
 
-       priv->flags |= DEVICE_FLAGS_UNPLUG;
+       set_bit(DEVICE_FLAGS_UNPLUG, &priv->flags);
 
        ieee80211_free_hw(priv->hw);
 }