From 6df1a83ba75d71024e489b67584d298b24305fcf Mon Sep 17 00:00:00 2001 From: Monam Agarwal Date: Wed, 5 Mar 2014 06:05:51 +0530 Subject: Staging: crystalhd: Fix different address spaces warning from sparse in crystalhd_misc.c This patch fixes following sparse warning in crystalhd_misc.c WARNING: incorrect type in argument Signed-off-by: Monam Agarwal Signed-off-by: Greg Kroah-Hartman --- drivers/staging/crystalhd/crystalhd_lnx.h | 4 ++-- drivers/staging/crystalhd/crystalhd_misc.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/staging') diff --git a/drivers/staging/crystalhd/crystalhd_lnx.h b/drivers/staging/crystalhd/crystalhd_lnx.h index 816e1cd5db62..49e1ef3a19af 100644 --- a/drivers/staging/crystalhd/crystalhd_lnx.h +++ b/drivers/staging/crystalhd/crystalhd_lnx.h @@ -58,11 +58,11 @@ struct crystalhd_adp { unsigned long pci_mem_start; uint32_t pci_mem_len; - void *addr; + void __iomem *addr; unsigned long pci_i2o_start; uint32_t pci_i2o_len; - void *i2o_addr; + void __iomem *i2o_addr; unsigned int drv_data; unsigned int dmabits; /* 32 | 64 */ diff --git a/drivers/staging/crystalhd/crystalhd_misc.c b/drivers/staging/crystalhd/crystalhd_misc.c index c3d024406337..3aabf75b7d97 100644 --- a/drivers/staging/crystalhd/crystalhd_misc.c +++ b/drivers/staging/crystalhd/crystalhd_misc.c @@ -740,7 +740,7 @@ enum BC_STATUS crystalhd_map_dio(struct crystalhd_adp *adp, void *ubuff, dio->fb_size = ubuff_sz & 0x03; if (dio->fb_size) { res = copy_from_user(dio->fb_va, - (void *)(uaddr + count - dio->fb_size), + (void __user *)(uaddr + count - dio->fb_size), dio->fb_size); if (res) { BCMLOG_ERR("failed %d to copy %u fill bytes from %p\n", -- cgit v1.2.1