ath10k: remove pci features var

The ATH10K_PCI_FEATURE_MSI_X was originally
introduced to support both chips QCA988Xv1 and
QCA988Xv2. Since v1 isn't supported anymore it
doesn't make sense to keep the feature flag
around. Since this is the last one remove the
whole thing.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index 42be18c054ef747fdd78d9a0fbeff278d2f6aef6..bbad9662b0fd94a8cc81c133c8b78d89b9d1714d 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -2317,8 +2317,6 @@ static void ath10k_pci_init_irq_tasklets(struct ath10k *ar)
 static int ath10k_pci_init_irq(struct ath10k *ar)
 {
        struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
-       bool msix_supported = test_bit(ATH10K_PCI_FEATURE_MSI_X,
-                                      ar_pci->features);
        int ret;
 
        ath10k_pci_init_irq_tasklets(ar);
@@ -2328,7 +2326,7 @@ static int ath10k_pci_init_irq(struct ath10k *ar)
                ath10k_info("limiting irq mode to: %d\n", ath10k_pci_irq_mode);
 
        /* Try MSI-X */
-       if (ath10k_pci_irq_mode == ATH10K_PCI_IRQ_AUTO && msix_supported) {
+       if (ath10k_pci_irq_mode == ATH10K_PCI_IRQ_AUTO) {
                ar_pci->num_msi_intrs = MSI_NUM_REQUEST;
                ret = pci_enable_msi_range(ar_pci->pdev, ar_pci->num_msi_intrs,
                                                         ar_pci->num_msi_intrs);
@@ -2484,22 +2482,6 @@ static int ath10k_pci_cold_reset(struct ath10k *ar)
        return 0;
 }
 
-static void ath10k_pci_dump_features(struct ath10k_pci *ar_pci)
-{
-       int i;
-
-       for (i = 0; i < ATH10K_PCI_FEATURE_COUNT; i++) {
-               if (!test_bit(i, ar_pci->features))
-                       continue;
-
-               switch (i) {
-               case ATH10K_PCI_FEATURE_MSI_X:
-                       ath10k_dbg(ATH10K_DBG_BOOT, "device supports MSI-X\n");
-                       break;
-               }
-       }
-}
-
 static int ath10k_pci_probe(struct pci_dev *pdev,
                            const struct pci_device_id *pci_dev)
 {
@@ -2521,19 +2503,6 @@ static int ath10k_pci_probe(struct pci_dev *pdev,
        ar_pci = ath10k_pci_priv(ar);
        ar_pci->pdev = pdev;
        ar_pci->dev = &pdev->dev;
-
-       switch (pci_dev->device) {
-       case QCA988X_2_0_DEVICE_ID:
-               set_bit(ATH10K_PCI_FEATURE_MSI_X, ar_pci->features);
-               break;
-       default:
-               ret = -ENODEV;
-               ath10k_err("Unknown device ID: %d\n", pci_dev->device);
-               goto err_core_destroy;
-       }
-
-       ath10k_pci_dump_features(ar_pci);
-
        ar_pci->ar = ar;
 
        pci_set_drvdata(pdev, ar);

diff --git a/drivers/net/wireless/ath/ath10k/pci.h b/drivers/net/wireless/ath/ath10k/pci.h
index 65b1b90cd5d34440518ef4cc36d98da713c74a44..662bca3922efbbcd9e48f2d93644d5bd0124678f 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/pci.h
+++ b/drivers/net/wireless/ath/ath10k/pci.h
@@ -135,13 +135,6 @@ struct service_to_pipe {
        u32 pipenum;
 };
 
-enum ath10k_pci_features {
-       ATH10K_PCI_FEATURE_MSI_X                = 0,
-
-       /* keep last */
-       ATH10K_PCI_FEATURE_COUNT
-};
-
 /* Per-pipe state. */
 struct ath10k_pci_pipe {
        /* Handle of underlying Copy Engine */
@@ -168,8 +161,6 @@ struct ath10k_pci {
        struct ath10k *ar;
        void __iomem *mem;
 
-       DECLARE_BITMAP(features, ATH10K_PCI_FEATURE_COUNT);
-
        /*
         * Number of MSI interrupts granted, 0 --> using legacy PCI line
         * interrupts.