ath5k: remove last references to "softc"

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath5k/ahb.c b/drivers/net/wireless/ath/ath5k/ahb.c
index a2a167363dbfcb7fe8634db1ea7eb192fdea1fa6..e5be7e701816bb7e40c277e1ed884e91d52663c5 100644 (file)
--- a/drivers/net/wireless/ath/ath5k/ahb.c
+++ b/drivers/net/wireless/ath/ath5k/ahb.c
@@ -169,7 +169,7 @@ static int ath_ahb_probe(struct platform_device *pdev)
                        __set_bit(ATH_STAT_2G_DISABLED, ah->status);
        }
 
-       ret = ath5k_init_softc(ah, &ath_ahb_bus_ops);
+       ret = ath5k_init_ah(ah, &ath_ahb_bus_ops);
        if (ret != 0) {
                dev_err(&pdev->dev, "failed to attach device, err=%d\n", ret);
                ret = -ENODEV;
@@ -214,7 +214,7 @@ static int ath_ahb_remove(struct platform_device *pdev)
                __raw_writel(reg, (void __iomem *) AR5K_AR5312_ENABLE);
        }
 
-       ath5k_deinit_softc(ah);
+       ath5k_deinit_ah(ah);
        platform_set_drvdata(pdev, NULL);
        ieee80211_free_hw(hw);
 

diff --git a/drivers/net/wireless/ath/ath5k/attach.c b/drivers/net/wireless/ath/ath5k/attach.c
index 96627ed6d57ac7158ae1532087143f69ffc3c6c3..91627dd2c26a175ceb6c7168267f1f2e135d2772 100644 (file)
--- a/drivers/net/wireless/ath/ath5k/attach.c
+++ b/drivers/net/wireless/ath/ath5k/attach.c
@@ -94,7 +94,7 @@ static int ath5k_hw_post(struct ath5k_hw *ah)
 /**
  * ath5k_hw_init - Check if hw is supported and init the needed structs
  *
- * @ah: The &struct ath5k_hw we got from the driver's init_softc function
+ * @ah: The &struct ath5k_hw associated with the device
  *
  * Check if the device is supported, perform a POST and initialize the needed
  * structs. Returns -ENOMEM if we don't have memory for the needed structs,

diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index e5adad4bc5223a13f90504d0ceafb2875eb17bb4..108d55a0696514e52a4892df398b1cd9b7d914cc 100644 (file)
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -2338,7 +2338,7 @@ ath5k_tx_complete_poll_work(struct work_struct *work)
 \*************************/
 
 int __devinit
-ath5k_init_softc(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops)
+ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops)
 {
        struct ieee80211_hw *hw = ah->hw;
        struct ath_common *common;
@@ -2891,7 +2891,7 @@ err:
 }
 
 void
-ath5k_deinit_softc(struct ath5k_hw *ah)
+ath5k_deinit_ah(struct ath5k_hw *ah)
 {
        struct ieee80211_hw *hw = ah->hw;
 

diff --git a/drivers/net/wireless/ath/ath5k/base.h b/drivers/net/wireless/ath/ath5k/base.h
index 3952cc8dc4f764be3c639e57acbf68b3943cbc46..6c94c7ff23500abaf5aceed394e0ddb7c381468a 100644 (file)
--- a/drivers/net/wireless/ath/ath5k/base.h
+++ b/drivers/net/wireless/ath/ath5k/base.h
@@ -107,8 +107,8 @@ void ath5k_tx_queue(struct ieee80211_hw *hw, struct sk_buff *skb,
 
 const char *ath5k_chip_name(enum ath5k_srev_type type, u_int16_t val);
 
-int ath5k_init_softc(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops);
-void ath5k_deinit_softc(struct ath5k_hw *ah);
+int ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops);
+void ath5k_deinit_ah(struct ath5k_hw *ah);
 
 /* Check whether BSSID mask is supported */
 #define ath5k_hw_hasbssidmask(_ah) (ah->ah_version == AR5K_AR5212)

diff --git a/drivers/net/wireless/ath/ath5k/pci.c b/drivers/net/wireless/ath/ath5k/pci.c
index eaf79b49341e3dab89ee95e2ab6bddac8a058ef4..c1dff2ced0446b0869a4c226b66e2deb1404d970 100644 (file)
--- a/drivers/net/wireless/ath/ath5k/pci.c
+++ b/drivers/net/wireless/ath/ath5k/pci.c
@@ -261,7 +261,7 @@ ath5k_pci_probe(struct pci_dev *pdev,
        ah->iobase = mem; /* So we can unmap it on detach */
 
        /* Initialize */
-       ret = ath5k_init_softc(ah, &ath_pci_bus_ops);
+       ret = ath5k_init_ah(ah, &ath_pci_bus_ops);
        if (ret)
                goto err_free;
 
@@ -287,7 +287,7 @@ ath5k_pci_remove(struct pci_dev *pdev)
        struct ieee80211_hw *hw = pci_get_drvdata(pdev);
        struct ath5k_hw *ah = hw->priv;
 
-       ath5k_deinit_softc(ah);
+       ath5k_deinit_ah(ah);
        pci_iounmap(pdev, ah->iobase);
        pci_release_region(pdev, 0);
        pci_disable_device(pdev);