3 files changed, 10 insertions, 10 deletions

diff --git a/sound/pci/ctxfi/cthardware.h b/sound/pci/ctxfi/cthardware.h
index 5977e9a24b5c..c5ded6a6654f 100644
--- a/sound/pci/ctxfi/cthardware.h
+++ b/sound/pci/ctxfi/cthardware.h
@@ -186,7 +186,7 @@ struct hw {
         struct pci_dev *pci;    /* the pci kernel structure of this card */
         int irq;
         unsigned long io_base;
-        unsigned long mem_base;
+        void __iomem *mem_base;
 
         enum CHIPTYP chip_type;
         enum CTCARDS model;
diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c
index 71d496f780e3..8fc524fbaeab 100644
--- a/sound/pci/ctxfi/cthw20k1.c
+++ b/sound/pci/ctxfi/cthw20k1.c
@@ -1802,7 +1802,7 @@ static int uaa_to_xfi(struct pci_dev *pci)
         unsigned int is_uaa;
         unsigned int data[4] = {0};
         unsigned int io_base;
-        void *mem_base;
+        void __iomem *mem_base;
         int i;
         const u32 CTLX = CTLBITS('C', 'T', 'L', 'X');
         const u32 CTL_ = CTLBITS('C', 'T', 'L', '-');
@@ -1984,9 +1984,9 @@ static int hw_card_shutdown(struct hw *hw)
         hw->irq = -1;
 
         if (hw->mem_base)
-                iounmap((void *)hw->mem_base);
+                iounmap(hw->mem_base);
 
-        hw->mem_base = (unsigned long)NULL;
+        hw->mem_base = NULL;
 
         if (hw->io_base)
                 pci_release_regions(hw->pci);
diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c
index df2d8c5eb926..b2c5d5a05a95 100644
--- a/sound/pci/ctxfi/cthw20k2.c
+++ b/sound/pci/ctxfi/cthw20k2.c
@@ -2045,8 +2045,8 @@ static int hw_card_start(struct hw *hw)
                         goto error1;
 
                 hw->io_base = pci_resource_start(hw->pci, 2);
-                hw->mem_base = (unsigned long)ioremap(hw->io_base,
-                                        pci_resource_len(hw->pci, 2));
+                hw->mem_base = ioremap(hw->io_base,
+                                       pci_resource_len(hw->pci, 2));
                 if (!hw->mem_base) {
                         err = -ENOENT;
                         goto error2;
@@ -2106,9 +2106,9 @@ static int hw_card_shutdown(struct hw *hw)
         hw->irq = -1;
 
         if (hw->mem_base)
-                iounmap((void *)hw->mem_base);
+                iounmap(hw->mem_base);
 
-        hw->mem_base = (unsigned long)NULL;
+        hw->mem_base = NULL;
 
         if (hw->io_base)
                 pci_release_regions(hw->pci);
@@ -2228,12 +2228,12 @@ static int hw_resume(struct hw *hw, struct card_conf *info)
 
 static u32 hw_read_20kx(struct hw *hw, u32 reg)
 {
-        return readl((void *)(hw->mem_base + reg));
+        return readl(hw->mem_base + reg);
 }
 
 static void hw_write_20kx(struct hw *hw, u32 reg, u32 data)
 {
-        writel(data, (void *)(hw->mem_base + reg));
+        writel(data, hw->mem_base + reg);
 }
 
 static struct hw ct20k2_preset = {