From 7c929c337115d27ef407d4e3101bffd9b0b74ba2 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Thu, 16 Sep 2004 23:00:30 -0700 Subject: [PATCH] [PATCH] __iomem fixups for atiixp soundcards Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds --- sound/pci/atiixp.c | 8 ++++---- sound/pci/atiixp_modem.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c index d650dc7dda57b..61319fb5963ca 100644 --- a/sound/pci/atiixp.c +++ b/sound/pci/atiixp.c @@ -258,7 +258,7 @@ struct snd_atiixp { struct pci_dev *pci; unsigned long addr; - unsigned long remap_addr; + void __iomem *remap_addr; int irq; ac97_bus_t *ac97_bus; @@ -303,7 +303,7 @@ MODULE_DEVICE_TABLE(pci, snd_atiixp_ids); static int snd_atiixp_update_bits(atiixp_t *chip, unsigned int reg, unsigned int mask, unsigned int value) { - unsigned long addr = chip->remap_addr + reg; + void __iomem *addr = chip->remap_addr + reg; unsigned int data, old_data; old_data = data = readl(addr); data &= ~mask; @@ -1472,7 +1472,7 @@ static int snd_atiixp_free(atiixp_t *chip) if (chip->irq >= 0) free_irq(chip->irq, (void *)chip); if (chip->remap_addr) - iounmap((void *) chip->remap_addr); + iounmap(chip->remap_addr); pci_release_regions(chip->pci); kfree(chip); return 0; @@ -1515,7 +1515,7 @@ static int __devinit snd_atiixp_create(snd_card_t *card, return err; } chip->addr = pci_resource_start(pci, 0); - chip->remap_addr = (unsigned long) ioremap_nocache(chip->addr, pci_resource_len(pci, 0)); + chip->remap_addr = ioremap_nocache(chip->addr, pci_resource_len(pci, 0)); if (chip->remap_addr == 0) { snd_printk(KERN_ERR "AC'97 space ioremap problem\n"); snd_atiixp_free(chip); diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c index c1c82da093b67..bec2052ab3374 100644 --- a/sound/pci/atiixp_modem.c +++ b/sound/pci/atiixp_modem.c @@ -241,7 +241,7 @@ struct snd_atiixp { struct resource *res; /* memory i/o */ unsigned long addr; - unsigned long remap_addr; + void __iomem *remap_addr; int irq; ac97_bus_t *ac97_bus; @@ -284,7 +284,7 @@ MODULE_DEVICE_TABLE(pci, snd_atiixp_ids); static int snd_atiixp_update_bits(atiixp_t *chip, unsigned int reg, unsigned int mask, unsigned int value) { - unsigned long addr = chip->remap_addr + reg; + void __iomem *addr = chip->remap_addr + reg; unsigned int data, old_data; old_data = data = readl(addr); data &= ~mask; @@ -1194,7 +1194,7 @@ static int snd_atiixp_free(atiixp_t *chip) if (chip->irq >= 0) free_irq(chip->irq, (void *)chip); if (chip->remap_addr) - iounmap((void *) chip->remap_addr); + iounmap(chip->remap_addr); pci_release_regions(chip->pci); kfree(chip); return 0; @@ -1237,7 +1237,7 @@ static int __devinit snd_atiixp_create(snd_card_t *card, return err; } chip->addr = pci_resource_start(pci, 0); - chip->remap_addr = (unsigned long) ioremap_nocache(chip->addr, pci_resource_len(pci, 0)); + chip->remap_addr = ioremap_nocache(chip->addr, pci_resource_len(pci, 0)); if (chip->remap_addr == 0) { snd_printk(KERN_ERR "AC'97 space ioremap problem\n"); snd_atiixp_free(chip); -- 2.53.0