ath9k: fold struct ath_wiphy into struct ath_softc

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 3 insertions, 9 deletions

diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c
index 72f430e956ec..993672105963 100644
--- a/drivers/net/wireless/ath/ath9k/ahb.c
+++ b/drivers/net/wireless/ath/ath9k/ahb.c
@@ -54,7 +54,6 @@ static struct ath_bus_ops ath_ahb_bus_ops  = {
 static int ath_ahb_probe(struct platform_device *pdev)
 {
         void __iomem *mem;
-        struct ath_wiphy *aphy;
         struct ath_softc *sc;
         struct ieee80211_hw *hw;
         struct resource *res;
@@ -92,8 +91,7 @@ static int ath_ahb_probe(struct platform_device *pdev)
 
         irq = res->start;
 
-        hw = ieee80211_alloc_hw(sizeof(struct ath_wiphy) +
-                                sizeof(struct ath_softc), &ath9k_ops);
+        hw = ieee80211_alloc_hw(sizeof(struct ath_softc), &ath9k_ops);
         if (hw == NULL) {
                 dev_err(&pdev->dev, "no memory for ieee80211_hw\n");
                 ret = -ENOMEM;
@@ -103,10 +101,7 @@ static int ath_ahb_probe(struct platform_device *pdev)
         SET_IEEE80211_DEV(hw, &pdev->dev);
         platform_set_drvdata(pdev, hw);
 
-        aphy = hw->priv;
-        sc = (struct ath_softc *) (aphy + 1);
-        aphy->sc = sc;
-        aphy->hw = hw;
+        sc = hw->priv;
         sc->hw = hw;
         sc->dev = &pdev->dev;
         sc->mem = mem;
@@ -150,8 +145,7 @@ static int ath_ahb_remove(struct platform_device *pdev)
         struct ieee80211_hw *hw = platform_get_drvdata(pdev);
 
         if (hw) {
-                struct ath_wiphy *aphy = hw->priv;
-                struct ath_softc *sc = aphy->sc;
+                struct ath_softc *sc = hw->priv;
                 void __iomem *mem = sc->mem;
 
                 ath9k_deinit_device(sc);