ath5k: clean up base.h and its use

[deliverable/linux.git] / drivers / net / wireless / ath / ath5k / led.c

diff --git a/drivers/net/wireless/ath/ath5k/led.c b/drivers/net/wireless/ath/ath5k/led.c
index 127bfbd351724693bae12dbdd7279a61c3a14798..c1151c72371105aaf19a520334cd2cca854fe45c 100644 (file)
--- a/drivers/net/wireless/ath/ath5k/led.c
+++ b/drivers/net/wireless/ath/ath5k/led.c
@@ -41,7 +41,6 @@
 
 #include <linux/pci.h>
 #include "ath5k.h"
-#include "base.h"
 
 #define ATH_SDEVICE(subv, subd) \
        .vendor = PCI_ANY_ID, .device = PCI_ANY_ID, \
@@ -86,26 +85,26 @@ static DEFINE_PCI_DEVICE_TABLE(ath5k_led_devices) = {
        { }
 };
 
-void ath5k_led_enable(struct ath5k_softc *sc)
+void ath5k_led_enable(struct ath5k_hw *ah)
 {
-       if (test_bit(ATH_STAT_LEDSOFT, sc->status)) {
-               ath5k_hw_set_gpio_output(sc->ah, sc->led_pin);
-               ath5k_led_off(sc);
+       if (test_bit(ATH_STAT_LEDSOFT, ah->status)) {
+               ath5k_hw_set_gpio_output(ah, ah->led_pin);
+               ath5k_led_off(ah);
        }
 }
 
-static void ath5k_led_on(struct ath5k_softc *sc)
+static void ath5k_led_on(struct ath5k_hw *ah)
 {
-       if (!test_bit(ATH_STAT_LEDSOFT, sc->status))
+       if (!test_bit(ATH_STAT_LEDSOFT, ah->status))
                return;
-       ath5k_hw_set_gpio(sc->ah, sc->led_pin, sc->led_on);
+       ath5k_hw_set_gpio(ah, ah->led_pin, ah->led_on);
 }
 
-void ath5k_led_off(struct ath5k_softc *sc)
+void ath5k_led_off(struct ath5k_hw *ah)
 {
-       if (!test_bit(ATH_STAT_LEDSOFT, sc->status))
+       if (!test_bit(ATH_STAT_LEDSOFT, ah->status))
                return;
-       ath5k_hw_set_gpio(sc->ah, sc->led_pin, !sc->led_on);
+       ath5k_hw_set_gpio(ah, ah->led_pin, !ah->led_on);
 }
 
 static void
@@ -116,27 +115,27 @@ ath5k_led_brightness_set(struct led_classdev *led_dev,
                led_dev);
 
        if (brightness == LED_OFF)
-               ath5k_led_off(led->sc);
+               ath5k_led_off(led->ah);
        else
-               ath5k_led_on(led->sc);
+               ath5k_led_on(led->ah);
 }
 
 static int
-ath5k_register_led(struct ath5k_softc *sc, struct ath5k_led *led,
+ath5k_register_led(struct ath5k_hw *ah, struct ath5k_led *led,
                   const char *name, char *trigger)
 {
        int err;
 
-       led->sc = sc;
+       led->ah = ah;
        strncpy(led->name, name, sizeof(led->name));
        led->led_dev.name = led->name;
        led->led_dev.default_trigger = trigger;
        led->led_dev.brightness_set = ath5k_led_brightness_set;
 
-       err = led_classdev_register(sc->dev, &led->led_dev);
+       err = led_classdev_register(ah->dev, &led->led_dev);
        if (err) {
-               ATH5K_WARN(sc, "could not register LED %s\n", name);
-               led->sc = NULL;
+               ATH5K_WARN(ah, "could not register LED %s\n", name);
+               led->ah = NULL;
        }
        return err;
 }
@@ -144,30 +143,30 @@ ath5k_register_led(struct ath5k_softc *sc, struct ath5k_led *led,
 static void
 ath5k_unregister_led(struct ath5k_led *led)
 {
-       if (!led->sc)
+       if (!led->ah)
                return;
        led_classdev_unregister(&led->led_dev);
-       ath5k_led_off(led->sc);
-       led->sc = NULL;
+       ath5k_led_off(led->ah);
+       led->ah = NULL;
 }
 
-void ath5k_unregister_leds(struct ath5k_softc *sc)
+void ath5k_unregister_leds(struct ath5k_hw *ah)
 {
-       ath5k_unregister_led(&sc->rx_led);
-       ath5k_unregister_led(&sc->tx_led);
+       ath5k_unregister_led(&ah->rx_led);
+       ath5k_unregister_led(&ah->tx_led);
 }
 
-int __devinit ath5k_init_leds(struct ath5k_softc *sc)
+int __devinit ath5k_init_leds(struct ath5k_hw *ah)
 {
        int ret = 0;
-       struct ieee80211_hw *hw = sc->hw;
+       struct ieee80211_hw *hw = ah->hw;
 #ifndef CONFIG_ATHEROS_AR231X
-       struct pci_dev *pdev = sc->pdev;
+       struct pci_dev *pdev = ah->pdev;
 #endif
        char name[ATH5K_LED_MAX_NAME_LEN + 1];
        const struct pci_device_id *match;
 
-       if (!sc->pdev)
+       if (!ah->pdev)
                return 0;
 
 #ifdef CONFIG_ATHEROS_AR231X
@@ -176,24 +175,24 @@ int __devinit ath5k_init_leds(struct ath5k_softc *sc)
        match = pci_match_id(&ath5k_led_devices[0], pdev);
 #endif
        if (match) {
-               __set_bit(ATH_STAT_LEDSOFT, sc->status);
-               sc->led_pin = ATH_PIN(match->driver_data);
-               sc->led_on = ATH_POLARITY(match->driver_data);
+               __set_bit(ATH_STAT_LEDSOFT, ah->status);
+               ah->led_pin = ATH_PIN(match->driver_data);
+               ah->led_on = ATH_POLARITY(match->driver_data);
        }
 
-       if (!test_bit(ATH_STAT_LEDSOFT, sc->status))
+       if (!test_bit(ATH_STAT_LEDSOFT, ah->status))
                goto out;
 
-       ath5k_led_enable(sc);
+       ath5k_led_enable(ah);
 
        snprintf(name, sizeof(name), "ath5k-%s::rx", wiphy_name(hw->wiphy));
-       ret = ath5k_register_led(sc, &sc->rx_led, name,
+       ret = ath5k_register_led(ah, &ah->rx_led, name,
                ieee80211_get_rx_led_name(hw));
        if (ret)
                goto out;
 
        snprintf(name, sizeof(name), "ath5k-%s::tx", wiphy_name(hw->wiphy));
-       ret = ath5k_register_led(sc, &sc->tx_led, name,
+       ret = ath5k_register_led(ah, &ah->tx_led, name,
                ieee80211_get_tx_led_name(hw));
 out:
        return ret;