summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2014-07-24 21:13:17 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-24 15:09:59 -0700
commit4c3b0d457222e5a8d41241a19a2a74ad9b3dd8b0 (patch)
tree9a78c6f3341cde2be05027a04445a3ff33327c50
parent2746321ef4779608e4c0696c41b442936959ef47 (diff)
staging: vt6656: use set_bit to set flags
Replacing MP_SET_FLAG Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/vt6656/device.h1
-rw-r--r--drivers/staging/vt6656/main_usb.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index fd7105ea1f66..5ac80d8df471 100644
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -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))
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 87feba52d240..7798221c9ba5 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -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);
}