diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-08-04 17:04:17 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-14 09:12:39 -0400 |
commit | 14b46c8a87f835f4327afa32fad2a523a8fe584d (patch) | |
tree | fc9320631a03fd303583aa53ab1399b104858af5 | |
parent | 63b08b8d97a2a5ff23436cd52e8cd70c1de0319c (diff) |
zd1211rw: make it clear we don't use leds.h LED stuff
zd1211rw uses its own LED stuff so let rename its LED
stuff as such.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_chip.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_chip.h | 6 | ||||
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_mac.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c index 2c813d87092c..5e110a2328ae 100644 --- a/drivers/net/wireless/zd1211rw/zd_chip.c +++ b/drivers/net/wireless/zd1211rw/zd_chip.c | |||
@@ -1278,11 +1278,11 @@ int zd_chip_control_leds(struct zd_chip *chip, enum led_status status) | |||
1278 | other_led = chip->link_led == LED1 ? LED2 : LED1; | 1278 | other_led = chip->link_led == LED1 ? LED2 : LED1; |
1279 | 1279 | ||
1280 | switch (status) { | 1280 | switch (status) { |
1281 | case LED_OFF: | 1281 | case ZD_LED_OFF: |
1282 | ioreqs[0].value = FW_LINK_OFF; | 1282 | ioreqs[0].value = FW_LINK_OFF; |
1283 | ioreqs[1].value = v[1] & ~(LED1|LED2); | 1283 | ioreqs[1].value = v[1] & ~(LED1|LED2); |
1284 | break; | 1284 | break; |
1285 | case LED_SCANNING: | 1285 | case ZD_LED_SCANNING: |
1286 | ioreqs[0].value = FW_LINK_OFF; | 1286 | ioreqs[0].value = FW_LINK_OFF; |
1287 | ioreqs[1].value = v[1] & ~other_led; | 1287 | ioreqs[1].value = v[1] & ~other_led; |
1288 | if (get_seconds() % 3 == 0) { | 1288 | if (get_seconds() % 3 == 0) { |
@@ -1291,7 +1291,7 @@ int zd_chip_control_leds(struct zd_chip *chip, enum led_status status) | |||
1291 | ioreqs[1].value |= chip->link_led; | 1291 | ioreqs[1].value |= chip->link_led; |
1292 | } | 1292 | } |
1293 | break; | 1293 | break; |
1294 | case LED_ASSOCIATED: | 1294 | case ZD_LED_ASSOCIATED: |
1295 | ioreqs[0].value = FW_LINK_TX; | 1295 | ioreqs[0].value = FW_LINK_TX; |
1296 | ioreqs[1].value = v[1] & ~other_led; | 1296 | ioreqs[1].value = v[1] & ~other_led; |
1297 | ioreqs[1].value |= chip->link_led; | 1297 | ioreqs[1].value |= chip->link_led; |
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.h b/drivers/net/wireless/zd1211rw/zd_chip.h index ee42751d5cb0..678c139a840c 100644 --- a/drivers/net/wireless/zd1211rw/zd_chip.h +++ b/drivers/net/wireless/zd1211rw/zd_chip.h | |||
@@ -897,9 +897,9 @@ int zd_chip_lock_phy_regs(struct zd_chip *chip); | |||
897 | int zd_chip_unlock_phy_regs(struct zd_chip *chip); | 897 | int zd_chip_unlock_phy_regs(struct zd_chip *chip); |
898 | 898 | ||
899 | enum led_status { | 899 | enum led_status { |
900 | LED_OFF = 0, | 900 | ZD_LED_OFF = 0, |
901 | LED_SCANNING = 1, | 901 | ZD_LED_SCANNING = 1, |
902 | LED_ASSOCIATED = 2, | 902 | ZD_LED_ASSOCIATED = 2, |
903 | }; | 903 | }; |
904 | 904 | ||
905 | int zd_chip_control_leds(struct zd_chip *chip, enum led_status status); | 905 | int zd_chip_control_leds(struct zd_chip *chip, enum led_status status); |
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index 54abdd0c0045..55b7fbdc85dc 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c | |||
@@ -1013,7 +1013,7 @@ static void link_led_handler(struct work_struct *work) | |||
1013 | spin_unlock_irq(&mac->lock); | 1013 | spin_unlock_irq(&mac->lock); |
1014 | 1014 | ||
1015 | r = zd_chip_control_leds(chip, | 1015 | r = zd_chip_control_leds(chip, |
1016 | is_associated ? LED_ASSOCIATED : LED_SCANNING); | 1016 | is_associated ? ZD_LED_ASSOCIATED : ZD_LED_SCANNING); |
1017 | if (r) | 1017 | if (r) |
1018 | dev_dbg_f(zd_mac_dev(mac), "zd_chip_control_leds error %d\n", r); | 1018 | dev_dbg_f(zd_mac_dev(mac), "zd_chip_control_leds error %d\n", r); |
1019 | 1019 | ||
@@ -1038,5 +1038,5 @@ static void housekeeping_disable(struct zd_mac *mac) | |||
1038 | dev_dbg_f(zd_mac_dev(mac), "\n"); | 1038 | dev_dbg_f(zd_mac_dev(mac), "\n"); |
1039 | cancel_rearming_delayed_workqueue(zd_workqueue, | 1039 | cancel_rearming_delayed_workqueue(zd_workqueue, |
1040 | &mac->housekeeping.link_led_work); | 1040 | &mac->housekeeping.link_led_work); |
1041 | zd_chip_control_leds(&mac->chip, LED_OFF); | 1041 | zd_chip_control_leds(&mac->chip, ZD_LED_OFF); |
1042 | } | 1042 | } |