Commit 14b46c8a authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

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: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 63b08b8d

drivers/net/wireless/zd1211rw/zd_chip.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/zd1211rw/zd_chip.h

+3 −3
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/zd1211rw/zd_mac.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}