diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-11-10 12:56:40 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-11-15 13:26:45 -0500 |
commit | e39fdee1d7856817619326fa114438c146d74510 (patch) | |
tree | fb3730df3164aa6239571c2f39348afe74744fd9 /drivers/net/wireless/iwlwifi/iwl3945-base.c | |
parent | 81baf6ec9c190ae128748cf2a026bff5cb811b70 (diff) |
iwlwifi: put all the isr related function under ops
There were two type of isr supported by iwlwifi devices.
legacy isr - only used by legacy devices (3945 & 4965)
ict isr - used by all new generation of iwlwifi devices
Move all the isr related functions into ops, the ict type of isr
supports only needed for newer devices.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 6152a86c19b5..a55b4623e1c8 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -4120,7 +4120,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e | |||
4120 | 4120 | ||
4121 | pci_enable_msi(priv->pci_dev); | 4121 | pci_enable_msi(priv->pci_dev); |
4122 | 4122 | ||
4123 | err = request_irq(priv->pci_dev->irq, priv->cfg->ops->lib->isr, | 4123 | err = request_irq(priv->pci_dev->irq, priv->cfg->ops->lib->isr_ops.isr, |
4124 | IRQF_SHARED, DRV_NAME, priv); | 4124 | IRQF_SHARED, DRV_NAME, priv); |
4125 | if (err) { | 4125 | if (err) { |
4126 | IWL_ERR(priv, "Error allocating IRQ %d\n", priv->pci_dev->irq); | 4126 | IWL_ERR(priv, "Error allocating IRQ %d\n", priv->pci_dev->irq); |