From b679ad2fdb4b306009c60712c9ac0dff8e149ecb Mon Sep 17 00:00:00 2001
From: Malcolm Priestley <tvboxspy@gmail.com>
Date: Thu, 24 Jul 2014 21:13:13 +0100
Subject: [PATCH] staging: vt6656: Remove flags fMP_POST_READS and
fMP_POST_WRITES
MP_IS_READY(fMP_DISCONNECTED) is used to block thread in vnt_tx_context
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/staging/vt6656/device.h | 2 --
drivers/staging/vt6656/main_usb.c | 4 ----
drivers/staging/vt6656/usbpipe.c | 2 +-
3 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index 6b7bb8c99b1e7..273c6634ea98b 100644
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -406,8 +406,6 @@ struct vnt_private {
}
#define fMP_DISCONNECTED 0x00000002
-#define fMP_POST_READS 0x00000100
-#define fMP_POST_WRITES 0x00000200
#define MP_SET_FLAG(_M, _F) ((_M)->Flags |= (_F))
#define MP_CLEAR_FLAG(_M, _F) ((_M)->Flags &= ~(_F))
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index b99def77c44a0..f887bc07f82a2 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -552,8 +552,6 @@ static int vnt_start(struct ieee80211_hw *hw)
}
MP_CLEAR_FLAG(priv, fMP_DISCONNECTED);
- MP_SET_FLAG(priv, fMP_POST_READS);
- MP_SET_FLAG(priv, fMP_POST_WRITES);
if (device_init_registers(priv) == false) {
dev_dbg(&priv->usb->dev, " init register fail\n");
@@ -601,8 +599,6 @@ static void vnt_stop(struct ieee80211_hw *hw)
ieee80211_stop_queues(hw);
MP_SET_FLAG(priv, fMP_DISCONNECTED);
- MP_CLEAR_FLAG(priv, fMP_POST_WRITES);
- MP_CLEAR_FLAG(priv, fMP_POST_READS);
cancel_delayed_work_sync(&priv->run_command_work);
diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c
index 7b050ba92504d..c23a509ca1b09 100644
--- a/drivers/staging/vt6656/usbpipe.c
+++ b/drivers/staging/vt6656/usbpipe.c
@@ -289,7 +289,7 @@ int vnt_tx_context(struct vnt_private *priv,
int status;
struct urb *urb;
- if (!(MP_IS_READY(priv) && priv->Flags & fMP_POST_WRITES)) {
+ if (!(MP_IS_READY(priv))) {
context->in_use = false;
return STATUS_RESOURCES;
}
--
GitLab