iwlagn: remove ISR ops

The ISR (interrupt service routine) ops are now
no longer necessary since they are the same for
all devices this driver now handles.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index de5b287920b4a18637f6cc106e8b5421d8358695..1b27992918342701ac403ce515b0f62961917995 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -209,13 +209,6 @@ static struct iwl_lib_ops iwl1000_lib = {
                .calib_version  = iwlagn_eeprom_calib_version,
                .query_addr = iwlagn_eeprom_query_addr,
        },
-       .isr_ops = {
-               .isr = iwl_isr_ict,
-               .free = iwl_free_isr_ict,
-               .alloc = iwl_alloc_isr_ict,
-               .reset = iwl_reset_ict,
-               .disable = iwl_disable_ict,
-       },
        .temp_ops = {
                .temperature = iwlagn_temperature,
         },

diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c
index d22e0069801c057164d7402bfb85b4555a11e413..f602af4b9408631bb54b9fdcf3c21a36f0eb59b0 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-2000.c
@@ -292,13 +292,6 @@ static struct iwl_lib_ops iwl2000_lib = {
                .query_addr = iwlagn_eeprom_query_addr,
                .update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,
        },
-       .isr_ops = {
-               .isr = iwl_isr_ict,
-               .free = iwl_free_isr_ict,
-               .alloc = iwl_alloc_isr_ict,
-               .reset = iwl_reset_ict,
-               .disable = iwl_disable_ict,
-       },
        .temp_ops = {
                .temperature = iwlagn_temperature,
        },

diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index de0e86a5d2f7170d1d5b2c2c2eda780226c86bf9..fb00464cead54562ecb81fb08d8a22a211a85196 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -378,13 +378,6 @@ static struct iwl_lib_ops iwl5000_lib = {
                .calib_version  = iwlagn_eeprom_calib_version,
                .query_addr = iwlagn_eeprom_query_addr,
        },
-       .isr_ops = {
-               .isr = iwl_isr_ict,
-               .free = iwl_free_isr_ict,
-               .alloc = iwl_alloc_isr_ict,
-               .reset = iwl_reset_ict,
-               .disable = iwl_disable_ict,
-       },
        .temp_ops = {
                .temperature = iwlagn_temperature,
         },
@@ -440,13 +433,6 @@ static struct iwl_lib_ops iwl5150_lib = {
                .calib_version  = iwlagn_eeprom_calib_version,
                .query_addr = iwlagn_eeprom_query_addr,
        },
-       .isr_ops = {
-               .isr = iwl_isr_ict,
-               .free = iwl_free_isr_ict,
-               .alloc = iwl_alloc_isr_ict,
-               .reset = iwl_reset_ict,
-               .disable = iwl_disable_ict,
-       },
        .temp_ops = {
                .temperature = iwl5150_temperature,
         },

diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index be2dbf7bd808a7fca3fae7cf13e41793c5182f73..24d105b29aec9318f9672c4ae9e144bf17504a8a 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -320,13 +320,6 @@ static struct iwl_lib_ops iwl6000_lib = {
                .query_addr = iwlagn_eeprom_query_addr,
                .update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,
        },
-       .isr_ops = {
-               .isr = iwl_isr_ict,
-               .free = iwl_free_isr_ict,
-               .alloc = iwl_alloc_isr_ict,
-               .reset = iwl_reset_ict,
-               .disable = iwl_disable_ict,
-       },
        .temp_ops = {
                .temperature = iwlagn_temperature,
         },
@@ -385,13 +378,6 @@ static struct iwl_lib_ops iwl6030_lib = {
                .query_addr = iwlagn_eeprom_query_addr,
                .update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,
        },
-       .isr_ops = {
-               .isr = iwl_isr_ict,
-               .free = iwl_free_isr_ict,
-               .alloc = iwl_alloc_isr_ict,
-               .reset = iwl_reset_ict,
-               .disable = iwl_disable_ict,
-       },
        .temp_ops = {
                .temperature = iwlagn_temperature,
         },

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 08bad17ca0ed8e7c85145505614f2a9ec0b4ec20..fd3aed8ed9601bf50c64ead2a4faa59edf90bc83 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2397,8 +2397,7 @@ static void __iwl_down(struct iwl_priv *priv)
                                STATUS_EXIT_PENDING;
 
        /* device going down, Stop using ICT table */
-       if (priv->cfg->ops->lib->isr_ops.disable)
-               priv->cfg->ops->lib->isr_ops.disable(priv);
+       iwl_disable_ict(priv);
 
        iwlagn_txq_ctx_stop(priv);
        iwlagn_rxq_stop(priv);
@@ -2606,8 +2605,7 @@ static void iwl_bg_alive_start(struct work_struct *data)
                goto unlock;
 
        /* enable dram interrupt */
-       if (priv->cfg->ops->lib->isr_ops.reset)
-               priv->cfg->ops->lib->isr_ops.reset(priv);
+       iwl_reset_ict(priv);
 
        iwl_alive_start(priv);
 unlock:
@@ -3958,10 +3956,9 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        pci_enable_msi(priv->pci_dev);
 
-       if (priv->cfg->ops->lib->isr_ops.alloc)
-               priv->cfg->ops->lib->isr_ops.alloc(priv);
+       iwl_alloc_isr_ict(priv);
 
-       err = request_irq(priv->pci_dev->irq, priv->cfg->ops->lib->isr_ops.isr,
+       err = request_irq(priv->pci_dev->irq, iwl_isr_ict,
                          IRQF_SHARED, DRV_NAME, priv);
        if (err) {
                IWL_ERR(priv, "Error allocating IRQ %d\n", priv->pci_dev->irq);
@@ -4008,8 +4005,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        destroy_workqueue(priv->workqueue);
        priv->workqueue = NULL;
        free_irq(priv->pci_dev->irq, priv);
-       if (priv->cfg->ops->lib->isr_ops.free)
-               priv->cfg->ops->lib->isr_ops.free(priv);
+       iwl_free_isr_ict(priv);
  out_disable_msi:
        pci_disable_msi(priv->pci_dev);
        iwl_uninit_drv(priv);
@@ -4107,8 +4103,7 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev)
 
        iwl_uninit_drv(priv);
 
-       if (priv->cfg->ops->lib->isr_ops.free)
-               priv->cfg->ops->lib->isr_ops.free(priv);
+       iwl_free_isr_ict(priv);
 
        dev_kfree_skb(priv->beacon_skb);
 

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index ada76af124a42ac7f77db512aca28664fdbea0de..82939f851eb9f40559a26fbc3a8ebc77063d3f39 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -122,14 +122,6 @@ struct iwl_apm_ops {
        void (*config)(struct iwl_priv *priv);
 };
 
-struct iwl_isr_ops {
-       irqreturn_t (*isr) (int irq, void *data);
-       void (*free)(struct iwl_priv *priv);
-       int (*alloc)(struct iwl_priv *priv);
-       int (*reset)(struct iwl_priv *priv);
-       void (*disable)(struct iwl_priv *priv);
-};
-
 struct iwl_debugfs_ops {
        ssize_t (*rx_stats_read)(struct file *file, char __user *user_buf,
                                 size_t count, loff_t *ppos);
@@ -194,9 +186,6 @@ struct iwl_lib_ops {
        int (*send_tx_power) (struct iwl_priv *priv);
        void (*update_chain_flags)(struct iwl_priv *priv);
 
-       /* isr */
-       struct iwl_isr_ops isr_ops;
-
        /* eeprom operations (as defined in iwl-eeprom.h) */
        struct iwl_eeprom_ops eeprom_ops;