lkml.org 
[lkml]   [2014]   [Mar]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] staging: cxt1e1: hwprobe: fix incorrect type in assignment
    Date
    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>
    ---
    drivers/staging/cxt1e1/hwprobe.c | 6 +++---
    drivers/staging/cxt1e1/pmcc4_private.h | 2 +-
    2 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/staging/cxt1e1/hwprobe.c b/drivers/staging/cxt1e1/hwprobe.c
    index 9b4198b..1a145ea 100644
    --- 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 eb28f09..451f12f 100644
    --- 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
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2014-03-23 13:41    [W:4.256 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site