ALSA: ctxfi: sparse warning

fixed sparse warning of incorrect type (different address spaces) in
cthw20k1.c and cthw20k2.c which was being actually caused as mem_base
was of the type unsigned long.

Again as mem_base was previously unsigned long , so it required many
typecasts in the code to convert interger to pointer.

Now after giving the correct type of mem_base as void __iomem *
we can also remove those typecasts maintaining the same functionality
and logic of the code.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/ctxfi/cthardware.h b/sound/pci/ctxfi/cthardware.h
index 5977e9a24b5ca68971e1f5f0dc17f17b03257098..c5ded6a6654f8ce5db06c83fa07a9ff01ba55b35 100644 (file)
--- 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 71d496f780e30ef30db9fc259e6394c133772b96..8fc524fbaeabf6bbfcf88f45ce83fc3b4dc07c86 100644 (file)
--- 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 df2d8c5eb926257afad145efda42cda3de345fc8..b2c5d5a05a956655a8e973c3f55c568b373d2907 100644 (file)
--- 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 = {