summaryrefslogtreecommitdiff
path: root/drivers/staging/vt6656/device.h
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2014-07-24 21:13:16 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-24 15:09:59 -0700
commit2746321ef4779608e4c0696c41b442936959ef47 (patch)
tree56a513646cf9cbe421ba906969f4c52bd1d1d2c8 /drivers/staging/vt6656/device.h
parent23e7c47dfce777435a083d4152954df02b4c347d (diff)
staging: vt6656: struct vnt_private merge flag and macros
merge u32 flag into unsigned long Flags Replacing fMP_DISCONNECTED with DEVICE_FLAGS_DISCONNECTED Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656/device.h')
-rw-r--r--drivers/staging/vt6656/device.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index ac4c7485463d..fd7105ea1f66 100644
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -262,7 +262,8 @@ enum {
};
/* flags for options */
-#define DEVICE_FLAGS_UNPLUG 0x00000001UL
+#define DEVICE_FLAGS_UNPLUG BIT(0)
+#define DEVICE_FLAGS_DISCONNECTED BIT(1)
struct vnt_private {
/* mac80211 */
@@ -281,8 +282,7 @@ struct vnt_private {
spinlock_t lock;
struct mutex usb_lock;
- u32 flags;
- unsigned long Flags;
+ unsigned long flags;
/* USB */
struct urb *interrupt_urb;
@@ -402,11 +402,9 @@ struct vnt_private {
(uVar)++; \
}
-#define fMP_DISCONNECTED 0x00000002
-
-#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))
+#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))
int vnt_init(struct vnt_private *priv);