ath9k_hw: distinguish single-chip solutions on initial probe print

[pandora-kernel.git] / drivers / net / wireless / ath / ath9k / ahb.c

diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c
index 33c9e81..329e6bc 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ahb.c
+++ b/drivers/net/wireless/ath/ath9k/ahb.c
@@ -29,15 +29,13 @@ static void ath_ahb_read_cachesize(struct ath_common *common, int *csz)
 
 static void ath_ahb_cleanup(struct ath_common *common)
 {
-       struct ath_hw *ah = (struct ath_hw *) common->ah;
-       struct ath_softc *sc = ah->ah_sc;
+       struct ath_softc *sc = (struct ath_softc *)common->priv;
        iounmap(sc->mem);
 }
 
 static bool ath_ahb_eeprom_read(struct ath_common *common, u32 off, u16 *data)
 {
-       struct ath_hw *ah = (struct ath_hw *) common->ah;
-       struct ath_softc *sc = ah->ah_sc;
+       struct ath_softc *sc = (struct ath_softc *)common->priv;
        struct platform_device *pdev = to_platform_device(sc->dev);
        struct ath9k_platform_data *pdata;
 
@@ -71,6 +69,7 @@ static int ath_ahb_probe(struct platform_device *pdev)
        int irq;
        int ret = 0;
        struct ath_hw *ah;
+       char hw_name[64];
 
        if (!pdev->dev.platform_data) {
                dev_err(&pdev->dev, "no platform data specified\n");
@@ -135,14 +134,11 @@ static int ath_ahb_probe(struct platform_device *pdev)
        }
 
        ah = sc->sc_ah;
+       ath9k_hw_name(ah, hw_name, sizeof(hw_name));
        printk(KERN_INFO
-              "%s: Atheros AR%s MAC/BB Rev:%x, "
-              "AR%s RF Rev:%x, mem=0x%lx, irq=%d\n",
+              "%s: %s mem=0x%lx, irq=%d\n",
               wiphy_name(hw->wiphy),
-              ath_mac_bb_name(ah->hw_version.macVersion),
-              ah->hw_version.macRev,
-              ath_rf_name((ah->hw_version.analog5GhzRev & AR_RADIO_SREV_MAJOR)),
-              ah->hw_version.phyRev,
+              hw_name,
               (unsigned long)mem, irq);
 
        return 0;