ath9k_htc: Cleanup device identification

ath.ko is a common module shared between ath5k, ar9170usb, ath9k and ath9k_htc.
Adding driver specific data to the shared structure would impact all the
drivers. Handling USB device recognition for devices specific to ath9k_htc
can be handled within the driver itself.

Also, AR7010 refers to the processor used in both AR9280/AR9287 based
devices. Rename the device enumerations accordingly.

While at it, check properly for the bus type when choosing the EEPROM
base address for UB95.

Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

7 files changed, 31 insertions, 30 deletions

diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
index 272dfef25453..3eb95e268f03 100644
--- a/drivers/net/wireless/ath/ath.h
+++ b/drivers/net/wireless/ath/ath.h
@@ -104,11 +104,6 @@ enum ath_cipher {
         ATH_CIPHER_MIC = 127
 };
 
-enum ath_drv_info {
-        AR7010_DEVICE           = BIT(0),
-        AR9287_DEVICE           = BIT(1),
-};
-
 /**
  * struct ath_ops - Register read/write operations
  *
@@ -153,7 +148,6 @@ struct ath_common {
         u8 rx_chainmask;
 
         u32 rx_bufsize;
-        u32 driver_info;
 
         u32 keymax;
         DECLARE_BITMAP(keymap, ATH_KEYMAX);
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_9287.c b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
index 9ec4bc80f758..065402f2e402 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
@@ -37,10 +37,10 @@ static bool ath9k_hw_ar9287_fill_eeprom(struct ath_hw *ah)
         int addr, eep_start_loc;
         eep_data = (u16 *)eep;
 
-        if (!common->driver_info)
-                eep_start_loc = AR9287_EEP_START_LOC;
-        else
+        if (common->bus_ops->ath_bus_type == ATH_USB)
                 eep_start_loc = AR9287_HTC_EEP_START_LOC;
+        else
+                eep_start_loc = AR9287_EEP_START_LOC;
 
         if (!ath9k_hw_use_flash(ah)) {
                 ath_dbg(common, ATH_DBG_EEPROM,
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index 8946e8ad1b85..cc1e5b3444a4 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -28,16 +28,7 @@ MODULE_FIRMWARE(FIRMWARE_AR9271);
 static struct usb_device_id ath9k_hif_usb_ids[] = {
         { USB_DEVICE(0x0cf3, 0x9271) }, /* Atheros */
         { USB_DEVICE(0x0cf3, 0x1006) }, /* Atheros */
-        { USB_DEVICE(0x0cf3, 0x7010),
-                .driver_info = AR7010_DEVICE },
-                                        /* Atheros */
-        { USB_DEVICE(0x0cf3, 0x7015),
-                .driver_info = AR7010_DEVICE | AR9287_DEVICE },
-                                        /* Atheros */
         { USB_DEVICE(0x0846, 0x9030) }, /* Netgear N150 */
-        { USB_DEVICE(0x0846, 0x9018),
-                .driver_info = AR7010_DEVICE },
-                                        /* Netgear WNDA3200 */
         { USB_DEVICE(0x07D1, 0x3A10) }, /* Dlink Wireless 150 */
         { USB_DEVICE(0x13D3, 0x3327) }, /* Azurewave */
         { USB_DEVICE(0x13D3, 0x3328) }, /* Azurewave */
@@ -46,13 +37,20 @@ static struct usb_device_id ath9k_hif_usb_ids[] = {
         { USB_DEVICE(0x13D3, 0x3349) }, /* Azurewave */
         { USB_DEVICE(0x13D3, 0x3350) }, /* Azurewave */
         { USB_DEVICE(0x04CA, 0x4605) }, /* Liteon */
-        { USB_DEVICE(0x083A, 0xA704),
-                .driver_info = AR7010_DEVICE },
-                                        /* SMC Networks */
         { USB_DEVICE(0x040D, 0x3801) }, /* VIA */
+
+        { USB_DEVICE(0x0cf3, 0x7015),
+          .driver_info = AR9287_USB },  /* Atheros */
         { USB_DEVICE(0x1668, 0x1200),
-                .driver_info = AR7010_DEVICE | AR9287_DEVICE },
-                                        /* Verizon */
+          .driver_info = AR9287_USB },  /* Verizon */
+
+        { USB_DEVICE(0x0cf3, 0x7010),
+          .driver_info = AR9280_USB },  /* Atheros */
+        { USB_DEVICE(0x0846, 0x9018),
+          .driver_info = AR9280_USB },  /* Netgear WNDA3200 */
+        { USB_DEVICE(0x083A, 0xA704),
+          .driver_info = AR9280_USB },  /* SMC Networks */
+
         { },
 };
 
@@ -818,7 +816,7 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev,
         }
         kfree(buf);
 
-        if (drv_info & AR7010_DEVICE)
+        if (IS_AR7010_DEVICE(drv_info))
                 firm_offset = AR7010_FIRMWARE_TEXT;
         else
                 firm_offset = AR9271_FIRMWARE_TEXT;
@@ -934,7 +932,7 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface,
 
         /* Find out which firmware to load */
 
-        if (id->driver_info & AR7010_DEVICE)
+        if (IS_AR7010_DEVICE(id->driver_info))
                 if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x0202)
                         hif_dev->fw_name = FIRMWARE_AR7010_1_1;
                 else
@@ -1034,7 +1032,7 @@ static int ath9k_hif_usb_resume(struct usb_interface *interface)
 
         if (hif_dev->firmware) {
                 ret = ath9k_hif_usb_download_fw(hif_dev,
-                                htc_handle->drv_priv->ah->common.driver_info);
+                                htc_handle->drv_priv->ah->hw_version.usbdev);
                 if (ret)
                         goto fail_resume;
         } else {
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.h b/drivers/net/wireless/ath/ath9k/hif_usb.h
index 2daf97b11c08..e4a5e2e79541 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.h
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.h
@@ -17,6 +17,8 @@
 #ifndef HTC_USB_H
 #define HTC_USB_H
 
+#define IS_AR7010_DEVICE(_v) (((_v) == AR9280_USB) || ((_v) == AR9287_USB))
+
 #define AR9271_FIRMWARE       0x501000
 #define AR9271_FIRMWARE_TEXT  0x903000
 #define AR7010_FIRMWARE_TEXT  0x906000
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index f89f6635abae..680cd369f144 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -246,7 +246,7 @@ static int ath9k_init_htc_services(struct ath9k_htc_priv *priv, u16 devid,
          * the HIF layer, shouldn't matter much.
          */
 
-        if (drv_info & AR7010_DEVICE)
+        if (IS_AR7010_DEVICE(drv_info))
                 priv->htc->credits = 45;
         else
                 priv->htc->credits = 33;
@@ -630,6 +630,7 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv,
 
         ah->hw_version.devid = devid;
         ah->hw_version.subsysid = 0; /* FIXME */
+        ah->hw_version.usbdev = drv_info;
         ah->ah_flags |= AH_USE_EEPROM;
         priv->ah = ah;
 
@@ -640,7 +641,6 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv,
         common->hw = priv->hw;
         common->priv = priv;
         common->debug_mask = ath9k_debug;
-        common->driver_info = drv_info;
 
         spin_lock_init(&priv->wmi->wmi_lock);
         spin_lock_init(&priv->beacon_lock);
@@ -891,7 +891,7 @@ int ath9k_htc_resume(struct htc_target *htc_handle)
                 return ret;
 
         ret = ath9k_init_htc_services(priv, priv->ah->hw_version.devid,
-                                      priv->ah->common.driver_info);
+                                      priv->ah->hw_version.usbdev);
         return ret;
 }
 #endif
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index fcfd63efe55a..d83cc3b4685b 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -446,6 +446,7 @@ struct ath9k_hw_version {
         u16 analog5GhzRev;
         u16 analog2GhzRev;
         u16 subsysid;
+        enum ath_usb_dev usbdev;
 };
 
 /* Generic TSF timer definitions */
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
index d3257f783a64..4df5659c6c16 100644
--- a/drivers/net/wireless/ath/ath9k/reg.h
+++ b/drivers/net/wireless/ath/ath9k/reg.h
@@ -871,8 +871,14 @@
     (AR_SREV_9285_12_OR_LATER(_ah) && \
      ((REG_READ(_ah, AR_AN_SYNTH9) & 0x7) == 0x1))
 
+enum ath_usb_dev {
+        AR9280_USB = 1, /* AR7010 + AR9280, UB94 */
+        AR9287_USB = 2, /* AR7010 + AR9287, UB95 */
+};
+
 #define AR_DEVID_7010(_ah) \
-        ((_ah)->common.driver_info & AR7010_DEVICE)
+        (((_ah)->hw_version.usbdev == AR9280_USB) || \
+         ((_ah)->hw_version.usbdev == AR9287_USB))
 
 #define AR_RADIO_SREV_MAJOR                   0xf0
 #define AR_RAD5133_SREV_MAJOR                 0xc0