iwlegacy: use writeb,writel,readl directly

That change will save us some CPU cycles at run time. Having
port-based I/O seems to be not possible for PCIe devices.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index aa8f5c0bd64234fb64c3358faeeb81725b48643e..63ec05b15ba34ee1547d85952664523080e05af9 100644 (file)
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -3655,7 +3655,7 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        /***********************
         * 3. Read REV Register
         * ********************/
-       il->hw_base = pci_iomap(pdev, 0, 0);
+       il->hw_base = pci_ioremap_bar(pdev, 0);
        if (!il->hw_base) {
                err = -ENODEV;
                goto out_pci_release_regions;
@@ -3780,7 +3780,7 @@ out_unset_hw_params:
 out_eeprom_free:
        il_eeprom_free(il);
 out_iounmap:
-       pci_iounmap(pdev, il->hw_base);
+       iounmap(il->hw_base);
 out_pci_release_regions:
        pci_release_regions(pdev);
 out_pci_disable_device:
@@ -3860,7 +3860,7 @@ il3945_pci_remove(struct pci_dev *pdev)
        free_irq(pdev->irq, il);
        pci_disable_msi(pdev);
 
-       pci_iounmap(pdev, il->hw_base);
+       iounmap(il->hw_base);
        pci_release_regions(pdev);
        pci_disable_device(pdev);
        pci_set_drvdata(pdev, NULL);

diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 90c9bfb089f47af088f831f345368c7853c3a639..7bf78bf866cae4d545a3fafa3c590ff8cf0e9a50 100644 (file)
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -6224,7 +6224,7 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        /***********************
         * 3. Read REV register
         ***********************/
-       il->hw_base = pci_iomap(pdev, 0, 0);
+       il->hw_base = pci_ioremap_bar(pdev, 0);
        if (!il->hw_base) {
                err = -ENODEV;
                goto out_pci_release_regions;
@@ -6356,7 +6356,7 @@ out_disable_msi:
 out_free_eeprom:
        il_eeprom_free(il);
 out_iounmap:
-       pci_iounmap(pdev, il->hw_base);
+       iounmap(il->hw_base);
 out_pci_release_regions:
        pci_set_drvdata(pdev, NULL);
        pci_release_regions(pdev);
@@ -6438,7 +6438,7 @@ il4965_pci_remove(struct pci_dev *pdev)
 
        free_irq(il->pci_dev->irq, il);
        pci_disable_msi(il->pci_dev);
-       pci_iounmap(pdev, il->hw_base);
+       iounmap(il->hw_base);
        pci_release_regions(pdev);
        pci_disable_device(pdev);
        pci_set_drvdata(pdev, NULL);

diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h
index df9b5b46283921e056f55c439c488d78bc8ba58a..fd2a4eea85e485673e4fd4b7e0f7ec62170a76ab 100644 (file)
--- a/drivers/net/wireless/iwlegacy/common.h
+++ b/drivers/net/wireless/iwlegacy/common.h
@@ -2114,20 +2114,20 @@ extern void il_write_targ_mem(struct il_priv *il, u32 addr, u32 val);
 static inline void
 _il_write8(struct il_priv *il, u32 ofs, u8 val)
 {
-       iowrite8(val, il->hw_base + ofs);
+       writeb(val, il->hw_base + ofs);
 }
 #define il_write8(il, ofs, val) _il_write8(il, ofs, val)
 
 static inline void
 _il_wr(struct il_priv *il, u32 ofs, u32 val)
 {
-       iowrite32(val, il->hw_base + ofs);
+       writel(val, il->hw_base + ofs);
 }
 
 static inline u32
 _il_rd(struct il_priv *il, u32 ofs)
 {
-       return ioread32(il->hw_base + ofs);
+       return readl(il->hw_base + ofs);
 }
 
 static inline void