summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Medve <Emilian.Medve@Freescale.com>2014-01-17 16:57:34 (GMT)
committerEmilian Medve <Emilian.Medve@freescale.com>2014-01-22 16:59:54 (GMT)
commit76416dc322574ceb81309e3529622b47a7e547b9 (patch)
tree584e5270e506fc5d9159579204aaddd65ed6af9c
parent9b14536ded82ecd6542f4173976adc5e66411845 (diff)
downloadlinux-fsl-qoriq-76416dc322574ceb81309e3529622b47a7e547b9.tar.xz
fsl_qbman: Use memset_io()
This fixes the following sparse warnings: warning: incorrect type in initializer (different modifiers) expected void *tmpp got void [noderef] * warning: incorrect type in argument 1 (different modifiers) expected void volatile [noderef] *addr got void *tmpp Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com> Change-Id: Ib3adc29b944c0dafe31d6796b9bae24466d4879d Reviewed-on: http://git.am.freescale.net:8181/8099 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Haiying Wang <Haiying.Wang@freescale.com> Reviewed-by: Emilian Medve <Emilian.Medve@freescale.com>
-rw-r--r--drivers/staging/fsl_qbman/bman_config.c4
-rw-r--r--drivers/staging/fsl_qbman/qman_config.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/fsl_qbman/bman_config.c b/drivers/staging/fsl_qbman/bman_config.c
index d7e677b..a0dfb29 100644
--- a/drivers/staging/fsl_qbman/bman_config.c
+++ b/drivers/staging/fsl_qbman/bman_config.c
@@ -291,8 +291,8 @@ static __init int parse_mem_property(struct device_node *node, const char *name,
flush_dcache_range(vaddr, vaddr + *sz);
} else if (zero) {
/* map as cacheable, non-guarded */
- void *tmpp = ioremap_prot(*addr, *sz, 0);
- memset(tmpp, 0, *sz);
+ void __iomem *tmpp = ioremap_prot(*addr, *sz, 0);
+ memset_io(tmpp, 0, *sz);
vaddr = (unsigned long)tmpp;
flush_dcache_range(vaddr, vaddr + *sz);
iounmap(tmpp);
diff --git a/drivers/staging/fsl_qbman/qman_config.c b/drivers/staging/fsl_qbman/qman_config.c
index 4a63ef1..4c90f8b 100644
--- a/drivers/staging/fsl_qbman/qman_config.c
+++ b/drivers/staging/fsl_qbman/qman_config.c
@@ -470,8 +470,8 @@ static __init int parse_mem_property(struct device_node *node, const char *name,
flush_dcache_range(vaddr, vaddr + *sz);
} else if (zero) {
/* map as cacheable, non-guarded */
- void *tmpp = ioremap_prot(*addr, *sz, 0);
- memset(tmpp, 0, *sz);
+ void __iomem *tmpp = ioremap_prot(*addr, *sz, 0);
+ memset_io(tmpp, 0, *sz);
vaddr = (unsigned long)tmpp;
flush_dcache_range(vaddr, vaddr + *sz);
iounmap(tmpp);