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>

diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index 2c813d87092c0b1c60846f12af4433bd6a03da68..5e110a2328aef327dedf1575eacab30bb739c69e 100644 (file)
--- 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)
        other_led = chip->link_led == LED1 ? LED2 : LED1;
 
        switch (status) {
-       case LED_OFF:
+       case ZD_LED_OFF:
                ioreqs[0].value = FW_LINK_OFF;
                ioreqs[1].value = v[1] & ~(LED1|LED2);
                break;
-       case LED_SCANNING:
+       case ZD_LED_SCANNING:
                ioreqs[0].value = FW_LINK_OFF;
                ioreqs[1].value = v[1] & ~other_led;
                if (get_seconds() % 3 == 0) {
@@ -1291,7 +1291,7 @@ int zd_chip_control_leds(struct zd_chip *chip, enum led_status status)
                        ioreqs[1].value |= chip->link_led;
                }
                break;
-       case LED_ASSOCIATED:
+       case ZD_LED_ASSOCIATED:
                ioreqs[0].value = FW_LINK_TX;
                ioreqs[1].value = v[1] & ~other_led;
                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 ee42751d5cb02039e3b226e97556288fa625b243..678c139a840c4ab02ca7ca693e09b01133ffb8f0 100644 (file)
--- 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);
 int zd_chip_unlock_phy_regs(struct zd_chip *chip);
 
 enum led_status {
-       LED_OFF = 0,
-       LED_SCANNING = 1,
-       LED_ASSOCIATED = 2,
+       ZD_LED_OFF = 0,
+       ZD_LED_SCANNING = 1,
+       ZD_LED_ASSOCIATED = 2,
 };
 
 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 54abdd0c00455aa8031d6b264fed41f4b48c90f8..55b7fbdc85dc06b1131c6acb1b8423b8e12c4533 100644 (file)
--- 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)
        spin_unlock_irq(&mac->lock);
 
        r = zd_chip_control_leds(chip,
-                                is_associated ? LED_ASSOCIATED : LED_SCANNING);
+                                is_associated ? ZD_LED_ASSOCIATED : ZD_LED_SCANNING);
        if (r)
                dev_dbg_f(zd_mac_dev(mac), "zd_chip_control_leds error %d\n", r);
 
@@ -1038,5 +1038,5 @@ static void housekeeping_disable(struct zd_mac *mac)
        dev_dbg_f(zd_mac_dev(mac), "\n");
        cancel_rearming_delayed_workqueue(zd_workqueue,
                &mac->housekeeping.link_led_work);
-       zd_chip_control_leds(&mac->chip, LED_OFF);
+       zd_chip_control_leds(&mac->chip, ZD_LED_OFF);
 }