staging: cxt1e1: hwprobe: fix incorrect type in assignment

This patch fixes "incorrect type in argument 1" warning from sparse.

Signed-off-by: Matei Oprea <eu@opreamatei.ro>
Cc: ROSEdu Kernel Community <firefly@lists.rosedu.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/cxt1e1/hwprobe.c b/drivers/staging/cxt1e1/hwprobe.c
index 9b4198b1e634e01982b3b3b8720aa9267a9aef2a..1a145ea1fa65949b59ff8f34a6bda100e4f7d6e7 100644 (file)
--- a/drivers/staging/cxt1e1/hwprobe.c
+++ b/drivers/staging/cxt1e1/hwprobe.c
@@ -174,12 +174,12 @@ cleanup_ioremap(void)
                if (hi->pci_slot == 0xff)
                        break;
                if (hi->addr_mapped[0]) {
-                       iounmap((void *)(hi->addr_mapped[0]));
+                       iounmap(hi->addr_mapped[0]);
                        release_mem_region((long) hi->addr[0], hi->len[0]);
                        hi->addr_mapped[0] = 0;
                }
                if (hi->addr_mapped[1]) {
-                       iounmap((void *)(hi->addr_mapped[1]));
+                       iounmap(hi->addr_mapped[1]);
                        release_mem_region((long) hi->addr[1], hi->len[1]);
                        hi->addr_mapped[1] = 0;
                }
@@ -329,7 +329,7 @@ c4hw_attach_all(void)
                                return -ENOMEM;
                        }
 
-                       hi->addr_mapped[j] = (unsigned long)ioremap(hi->addr[j], hi->len[j]);
+                       hi->addr_mapped[j] = ioremap(hi->addr[j], hi->len[j]);
                        if (!hi->addr_mapped[j]) {
                                pr_warning("%s: ioremap fails, addr=0x%lx, len=0x%lx ?\n",
                                           hi->devname, hi->addr[j], hi->len[j]);

diff --git a/drivers/staging/cxt1e1/pmcc4_private.h b/drivers/staging/cxt1e1/pmcc4_private.h
index eb28f095ff8c29c840d149165687b5e5037c0872..451f12f5b04c828d51e95680e95732366af0d1b3 100644 (file)
--- a/drivers/staging/cxt1e1/pmcc4_private.h
+++ b/drivers/staging/cxt1e1/pmcc4_private.h
@@ -262,7 +262,7 @@ struct s_hdw_info
     struct pci_dev *pdev[2];
 
     unsigned long addr[2];
-    unsigned long addr_mapped[2];
+    void __iomem *addr_mapped[2];
     unsigned long len[2];
 
     union