瀏覽代碼

rt2x00: Remove DEVICE_STATE_DISABLED_RADIO_HW

The DEVICE_STATE_DISABLED_RADIO_HW flag is only read but never set,
it is an ancient part of one of the many versions of the rfkill implementations
in rt2x00. It is about time is disappears.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Ivo van Doorn 16 年之前
父節點
當前提交
4b9631a473
共有 2 個文件被更改,包括 1 次插入3 次删除
  1. 0 1
      drivers/net/wireless/rt2x00/rt2x00.h
  2. 1 2
      drivers/net/wireless/rt2x00/rt2x00dev.c

+ 0 - 1
drivers/net/wireless/rt2x00/rt2x00.h

@@ -594,7 +594,6 @@ enum rt2x00_flags {
 	DEVICE_STATE_INITIALIZED,
 	DEVICE_STATE_STARTED,
 	DEVICE_STATE_ENABLED_RADIO,
-	DEVICE_STATE_DISABLED_RADIO_HW,
 
 	/*
 	 * Driver requirements

+ 1 - 2
drivers/net/wireless/rt2x00/rt2x00dev.c

@@ -40,8 +40,7 @@ int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev)
 	 * Don't enable the radio twice.
 	 * And check if the hardware button has been disabled.
 	 */
-	if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags) ||
-	    test_bit(DEVICE_STATE_DISABLED_RADIO_HW, &rt2x00dev->flags))
+	if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
 		return 0;
 
 	/*