From: Malcolm Priestley Date: Thu, 24 Jul 2014 20:13:18 +0000 (+0100) Subject: staging: vt6656: use clear_bit to remove device flag X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=2ab3d46dd3029946233e425fa4f4e3d50c79ee9d;p=deliverable%2Flinux.git staging: vt6656: use clear_bit to remove device flag Replacing MP_CLEAR_FLAG Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index 5ac80d8df471..21f810eb162f 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -402,7 +402,6 @@ struct vnt_private { (uVar)++; \ } -#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); diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index 7798221c9ba5..d729d949ce27 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -551,7 +551,7 @@ static int vnt_start(struct ieee80211_hw *hw) return -ENOMEM; } - MP_CLEAR_FLAG(priv, DEVICE_FLAGS_DISCONNECTED); + clear_bit(DEVICE_FLAGS_DISCONNECTED, &priv->flags); if (device_init_registers(priv) == false) { dev_dbg(&priv->usb->dev, " init register fail\n"); @@ -1025,7 +1025,7 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id) usb_device_reset(priv); - MP_CLEAR_FLAG(priv, DEVICE_FLAGS_DISCONNECTED); + clear_bit(DEVICE_FLAGS_DISCONNECTED, &priv->flags); vnt_reset_command_timer(priv); vnt_schedule_command(priv, WLAN_CMD_INIT_MAC80211);