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>
This commit is contained in:
Родитель
63b08b8d97
Коммит
14b46c8a87
|
@ -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;
|
other_led = chip->link_led == LED1 ? LED2 : LED1;
|
||||||
|
|
||||||
switch (status) {
|
switch (status) {
|
||||||
case LED_OFF:
|
case ZD_LED_OFF:
|
||||||
ioreqs[0].value = FW_LINK_OFF;
|
ioreqs[0].value = FW_LINK_OFF;
|
||||||
ioreqs[1].value = v[1] & ~(LED1|LED2);
|
ioreqs[1].value = v[1] & ~(LED1|LED2);
|
||||||
break;
|
break;
|
||||||
case LED_SCANNING:
|
case ZD_LED_SCANNING:
|
||||||
ioreqs[0].value = FW_LINK_OFF;
|
ioreqs[0].value = FW_LINK_OFF;
|
||||||
ioreqs[1].value = v[1] & ~other_led;
|
ioreqs[1].value = v[1] & ~other_led;
|
||||||
if (get_seconds() % 3 == 0) {
|
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;
|
ioreqs[1].value |= chip->link_led;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case LED_ASSOCIATED:
|
case ZD_LED_ASSOCIATED:
|
||||||
ioreqs[0].value = FW_LINK_TX;
|
ioreqs[0].value = FW_LINK_TX;
|
||||||
ioreqs[1].value = v[1] & ~other_led;
|
ioreqs[1].value = v[1] & ~other_led;
|
||||||
ioreqs[1].value |= chip->link_led;
|
ioreqs[1].value |= chip->link_led;
|
||||||
|
|
|
@ -897,9 +897,9 @@ int zd_chip_lock_phy_regs(struct zd_chip *chip);
|
||||||
int zd_chip_unlock_phy_regs(struct zd_chip *chip);
|
int zd_chip_unlock_phy_regs(struct zd_chip *chip);
|
||||||
|
|
||||||
enum led_status {
|
enum led_status {
|
||||||
LED_OFF = 0,
|
ZD_LED_OFF = 0,
|
||||||
LED_SCANNING = 1,
|
ZD_LED_SCANNING = 1,
|
||||||
LED_ASSOCIATED = 2,
|
ZD_LED_ASSOCIATED = 2,
|
||||||
};
|
};
|
||||||
|
|
||||||
int zd_chip_control_leds(struct zd_chip *chip, enum led_status status);
|
int zd_chip_control_leds(struct zd_chip *chip, enum led_status status);
|
||||||
|
|
|
@ -1013,7 +1013,7 @@ static void link_led_handler(struct work_struct *work)
|
||||||
spin_unlock_irq(&mac->lock);
|
spin_unlock_irq(&mac->lock);
|
||||||
|
|
||||||
r = zd_chip_control_leds(chip,
|
r = zd_chip_control_leds(chip,
|
||||||
is_associated ? LED_ASSOCIATED : LED_SCANNING);
|
is_associated ? ZD_LED_ASSOCIATED : ZD_LED_SCANNING);
|
||||||
if (r)
|
if (r)
|
||||||
dev_dbg_f(zd_mac_dev(mac), "zd_chip_control_leds error %d\n", 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");
|
dev_dbg_f(zd_mac_dev(mac), "\n");
|
||||||
cancel_rearming_delayed_workqueue(zd_workqueue,
|
cancel_rearming_delayed_workqueue(zd_workqueue,
|
||||||
&mac->housekeeping.link_led_work);
|
&mac->housekeeping.link_led_work);
|
||||||
zd_chip_control_leds(&mac->chip, LED_OFF);
|
zd_chip_control_leds(&mac->chip, ZD_LED_OFF);
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче