[ALSA] intel8x0 - Use pci_iomap

Use pci_iomap and ioread*/iowrite*() functions for accessing
hardwares.  pci_iomap is suitable for hardwares like ICH and
compatible that have both PIO and MMIO.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

1 files changed, 42 insertions, 78 deletions

diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 30aaa6092a84..28d5d9deb892 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -368,12 +368,8 @@ struct intel8x0 {
 
         int irq;
 
-        unsigned int mmio;
-        unsigned long addr;
-        void __iomem *remap_addr;
-        unsigned int bm_mmio;
-        unsigned long bmaddr;
-        void __iomem *remap_bmaddr;
+        void __iomem *addr;
+        void __iomem *bmaddr;
 
         struct pci_dev *pci;
         struct snd_card *card;
@@ -446,72 +442,48 @@ MODULE_DEVICE_TABLE(pci, snd_intel8x0_ids);
  *  Lowlevel I/O - busmaster
  */
 
-static u8 igetbyte(struct intel8x0 *chip, u32 offset)
+static inline u8 igetbyte(struct intel8x0 *chip, u32 offset)
 {
-        if (chip->bm_mmio)
-                return readb(chip->remap_bmaddr + offset);
-        else
-                return inb(chip->bmaddr + offset);
+        return ioread8(chip->bmaddr + offset);
 }
 
-static u16 igetword(struct intel8x0 *chip, u32 offset)
+static inline u16 igetword(struct intel8x0 *chip, u32 offset)
 {
-        if (chip->bm_mmio)
-                return readw(chip->remap_bmaddr + offset);
-        else
-                return inw(chip->bmaddr + offset);
+        return ioread16(chip->bmaddr + offset);
 }
 
-static u32 igetdword(struct intel8x0 *chip, u32 offset)
+static inline u32 igetdword(struct intel8x0 *chip, u32 offset)
 {
-        if (chip->bm_mmio)
-                return readl(chip->remap_bmaddr + offset);
-        else
-                return inl(chip->bmaddr + offset);
+        return ioread32(chip->bmaddr + offset);
 }
 
-static void iputbyte(struct intel8x0 *chip, u32 offset, u8 val)
+static inline void iputbyte(struct intel8x0 *chip, u32 offset, u8 val)
 {
-        if (chip->bm_mmio)
-                writeb(val, chip->remap_bmaddr + offset);
-        else
-                outb(val, chip->bmaddr + offset);
+        iowrite8(val, chip->bmaddr + offset);
 }
 
-static void iputword(struct intel8x0 *chip, u32 offset, u16 val)
+static inline void iputword(struct intel8x0 *chip, u32 offset, u16 val)
 {
-        if (chip->bm_mmio)
-                writew(val, chip->remap_bmaddr + offset);
-        else
-                outw(val, chip->bmaddr + offset);
+        iowrite16(val, chip->bmaddr + offset);
 }
 
-static void iputdword(struct intel8x0 *chip, u32 offset, u32 val)
+static inline void iputdword(struct intel8x0 *chip, u32 offset, u32 val)
 {
-        if (chip->bm_mmio)
-                writel(val, chip->remap_bmaddr + offset);
-        else
-                outl(val, chip->bmaddr + offset);
+        iowrite32(val, chip->bmaddr + offset);
 }
 
 /*
  *  Lowlevel I/O - AC'97 registers
  */
 
-static u16 iagetword(struct intel8x0 *chip, u32 offset)
+static inline u16 iagetword(struct intel8x0 *chip, u32 offset)
 {
-        if (chip->mmio)
-                return readw(chip->remap_addr + offset);
-        else
-                return inw(chip->addr + offset);
+        return ioread16(chip->addr + offset);
 }
 
-static void iaputword(struct intel8x0 *chip, u32 offset, u16 val)
+static inline void iaputword(struct intel8x0 *chip, u32 offset, u16 val)
 {
-        if (chip->mmio)
-                writew(val, chip->remap_addr + offset);
-        else
-                outw(val, chip->addr + offset);
+        iowrite16(val, chip->addr + offset);
 }
 
 /*
@@ -2443,10 +2415,10 @@ static int snd_intel8x0_free(struct intel8x0 *chip)
                         fill_nocache(chip->bdbars.area, chip->bdbars.bytes, 0);
                 snd_dma_free_pages(&chip->bdbars);
         }
-        if (chip->remap_addr)
-                iounmap(chip->remap_addr);
-        if (chip->remap_bmaddr)
-                iounmap(chip->remap_bmaddr);
+        if (chip->addr)
+                pci_iounmap(chip->pci, chip->addr);
+        if (chip->bmaddr)
+                pci_iounmap(chip->pci, chip->bmaddr);
         pci_release_regions(chip->pci);
         pci_disable_device(chip->pci);
         kfree(chip);
@@ -2793,35 +2765,27 @@ static int __devinit snd_intel8x0_create(struct snd_card *card,
 
         if (device_type == DEVICE_ALI) {
                 /* ALI5455 has no ac97 region */
-                chip->bmaddr = pci_resource_start(pci, 0);
+                chip->bmaddr = pci_iomap(pci, 0, 0);
                 goto port_inited;
         }
 
-        if (pci_resource_flags(pci, 2) & IORESOURCE_MEM) {      /* ICH4 and Nforce */
-                chip->mmio = 1;
-                chip->addr = pci_resource_start(pci, 2);
-                chip->remap_addr = ioremap_nocache(chip->addr,
-                                                   pci_resource_len(pci, 2));
-                if (chip->remap_addr == NULL) {
-                        snd_printk(KERN_ERR "AC'97 space ioremap problem\n");
-                        snd_intel8x0_free(chip);
-                        return -EIO;
-                }
-        } else {
-                chip->addr = pci_resource_start(pci, 0);
-        }
-        if (pci_resource_flags(pci, 3) & IORESOURCE_MEM) {      /* ICH4 */
-                chip->bm_mmio = 1;
-                chip->bmaddr = pci_resource_start(pci, 3);
-                chip->remap_bmaddr = ioremap_nocache(chip->bmaddr,
-                                                     pci_resource_len(pci, 3));
-                if (chip->remap_bmaddr == NULL) {
-                        snd_printk(KERN_ERR "Controller space ioremap problem\n");
-                        snd_intel8x0_free(chip);
-                        return -EIO;
-                }
-        } else {
-                chip->bmaddr = pci_resource_start(pci, 1);
+        if (pci_resource_flags(pci, 2) & IORESOURCE_MEM) /* ICH4 and Nforce */
+                chip->addr = pci_iomap(pci, 2, 0);
+        else
+                chip->addr = pci_iomap(pci, 0, 0);
+        if (!chip->addr) {
+                snd_printk(KERN_ERR "AC'97 space ioremap problem\n");
+                snd_intel8x0_free(chip);
+                return -EIO;
+        }
+        if (pci_resource_flags(pci, 3) & IORESOURCE_MEM) /* ICH4 */
+                chip->bmaddr = pci_iomap(pci, 3, 0);
+        else
+                chip->bmaddr = pci_iomap(pci, 1, 0);
+        if (!chip->bmaddr) {
+                snd_printk(KERN_ERR "Controller space ioremap problem\n");
+                snd_intel8x0_free(chip);
+                return -EIO;
         }
 
  port_inited:
@@ -3025,8 +2989,8 @@ static int __devinit snd_intel8x0_probe(struct pci_dev *pci,
         snd_intel8x0_proc_init(chip);
 
         snprintf(card->longname, sizeof(card->longname),
-                 "%s with %s at %#lx, irq %i", card->shortname,
-                 snd_ac97_get_short_name(chip->ac97[0]), chip->addr, chip->irq);
+                 "%s with %s at irq %i", card->shortname,
+                 snd_ac97_get_short_name(chip->ac97[0]), chip->irq);
 
         if (! ac97_clock)
                 intel8x0_measure_ac97_clock(chip);