diff options
author | sricharan <r.sricharan@ti.com> | 2011-08-23 03:28:48 -0400 |
---|---|---|
committer | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2011-09-24 03:58:57 -0400 |
commit | 6616aac66d798f3f185d90d9057e47abd7d3c9b3 (patch) | |
tree | ed4bad47201257b917dc9a9f6f3c52ef202a6fd5 /arch/arm/mach-omap2/omap_l3_noc.c | |
parent | ed0e352073ff86c876ff7820ad0b6bac123082b5 (diff) |
OMAP: Fix sparse warnings in l3 error handler.
Fix below sparse warnings from the l3-noc and l3-smx error handlers
files.
arch/arm/mach-omap2/omap_l3_smx.h:209:22: warning: symbol 'omap3_l3_app_bases' was not declared. Should it be static?
arch/arm/mach-omap2/omap_l3_smx.h:308:22: warning: symbol 'omap3_l3_debug_bases' was not declared. Should it be static?
arch/arm/mach-omap2/omap_l3_smx.h:325:2: warning: incorrect type in initializer (different address spaces)
arch/arm/mach-omap2/omap_l3_smx.h:325:2: expected unsigned int [usertype] *
arch/arm/mach-omap2/omap_l3_smx.h:325:2: got unsigned int [noderef] [toplevel] <asn:2>*<noident>
arch/arm/mach-omap2/omap_l3_smx.h:326:2: warning: incorrect type in initializer (different address spaces)
arch/arm/mach-omap2/omap_l3_smx.h:326:2: expected unsigned int [usertype] *
arch/arm/mach-omap2/omap_l3_smx.h:326:2: got unsigned int [noderef] [toplevel] <asn:2>*<noident>
arch/arm/mach-omap2/omap_l3_smx.h:324:5: warning: symbol 'omap3_l3_bases' was not declared. Should it be static?
CC arch/arm/mach-omap2/omap_l3_smx.o
CHECK arch/arm/mach-omap2/omap_l3_noc.c
arch/arm/mach-omap2/omap_l3_noc.c:73:13: warning: symbol '__v' shadows an earlier one
arch/arm/mach-omap2/omap_l3_noc.c:73:13: originally declared here
arch/arm/mach-omap2/omap_l3_noc.c:83:20: warning: symbol '__v' shadows an earlier one
arch/arm/mach-omap2/omap_l3_noc.c:83:20: originally declared here
arch/arm/mach-omap2/omap_l3_noc.c:90:5: warning: symbol '__v' shadows an earlier one
arch/arm/mach-omap2/omap_l3_noc.c:90:5: originally declared here
arch/arm/mach-omap2/omap_l3_noc.h:39:5: warning: symbol 'l3_flagmux' was not declared. Should it be static?
arch/arm/mach-omap2/omap_l3_noc.h:46:5: warning: symbol 'l3_targ_inst_clk1' was not declared. Should it be static?
arch/arm/mach-omap2/omap_l3_noc.h:54:5: warning: symbol 'l3_targ_inst_clk2' was not declared. Should it be static?
arch/arm/mach-omap2/omap_l3_noc.h:75:5: warning: symbol 'l3_targ_inst_clk3' was not declared. Should it be static?
arch/arm/mach-omap2/omap_l3_noc.h:79:6: warning: symbol 'l3_targ_inst_name' was not declared. Should it be static?
arch/arm/mach-omap2/omap_l3_noc.h:112:5: warning: symbol 'l3_targ' was not declared. Should it be static?
arch/arm/mach-omap2/omap_l3_noc.c:72:11: warning: cast removes address space of expression
arch/arm/mach-omap2/omap_l3_noc.c:73:13: warning: incorrect type in argument 1 (different base types)
arch/arm/mach-omap2/omap_l3_noc.c:73:13: expected void const volatile [noderef] <asn:2>*<noident>
arch/arm/mach-omap2/omap_l3_noc.c:73:13: got unsigned int
arch/arm/mach-omap2/omap_l3_noc.c:83:20: warning: incorrect type in argument 1 (different base types)
arch/arm/mach-omap2/omap_l3_noc.c:83:20: expected void const volatile [noderef] <asn:2>*<noident>
arch/arm/mach-omap2/omap_l3_noc.c:83:20: got unsigned int
arch/arm/mach-omap2/omap_l3_noc.c:90:5: warning: incorrect type in argument 1 (different base types)
arch/arm/mach-omap2/omap_l3_noc.c:90:5: expected void const volatile [noderef] <asn:2>*<noident>
arch/arm/mach-omap2/omap_l3_noc.c:90:5: got unsigned int
arch/arm/mach-omap2/omap_l3_noc.c:96:5: warning: incorrect type in argument 1 (different base types)
arch/arm/mach-omap2/omap_l3_noc.c:96:5: expected void const volatile [noderef] <asn:2>*<noident>
arch/arm/mach-omap2/omap_l3_noc.c:96:5: got unsigned int
arch/arm/mach-omap2/omap_l3_noc.c:108:5: warning: incorrect type in argument 1 (different base types)
arch/arm/mach-omap2/omap_l3_noc.c:108:5: expected void const volatile [noderef] <asn:2>*<noident>
arch/arm/mach-omap2/omap_l3_noc.c:108:5: got unsigned int
Signed-off-by: sricharan <r.sricharan@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reported-by: Paul Walmsley <paul@pwsan.com>
Reviewed-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/omap_l3_noc.c')
-rw-r--r-- | arch/arm/mach-omap2/omap_l3_noc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/omap_l3_noc.c b/arch/arm/mach-omap2/omap_l3_noc.c index 1f68e95c3e80..8f1835711676 100644 --- a/arch/arm/mach-omap2/omap_l3_noc.c +++ b/arch/arm/mach-omap2/omap_l3_noc.c | |||
@@ -58,7 +58,8 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3) | |||
58 | struct omap4_l3 *l3 = _l3; | 58 | struct omap4_l3 *l3 = _l3; |
59 | int inttype, i; | 59 | int inttype, i; |
60 | int err_src = 0; | 60 | int err_src = 0; |
61 | u32 std_err_main, err_reg, clear, base, l3_targ_base; | 61 | u32 std_err_main, err_reg, clear; |
62 | void __iomem *base, *l3_targ_base; | ||
62 | char *source_name; | 63 | char *source_name; |
63 | 64 | ||
64 | /* Get the Type of interrupt */ | 65 | /* Get the Type of interrupt */ |
@@ -69,8 +70,8 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3) | |||
69 | * Read the regerr register of the clock domain | 70 | * Read the regerr register of the clock domain |
70 | * to determine the source | 71 | * to determine the source |
71 | */ | 72 | */ |
72 | base = (u32)l3->l3_base[i]; | 73 | base = l3->l3_base[i]; |
73 | err_reg = readl(base + l3_flagmux[i] + | 74 | err_reg = __raw_readl(base + l3_flagmux[i] + |
74 | + L3_FLAGMUX_REGERR0 + (inttype << 3)); | 75 | + L3_FLAGMUX_REGERR0 + (inttype << 3)); |
75 | 76 | ||
76 | /* Get the corresponding error and analyse */ | 77 | /* Get the corresponding error and analyse */ |
@@ -80,7 +81,7 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3) | |||
80 | 81 | ||
81 | /* Read the stderrlog_main_source from clk domain */ | 82 | /* Read the stderrlog_main_source from clk domain */ |
82 | l3_targ_base = base + *(l3_targ[i] + err_src); | 83 | l3_targ_base = base + *(l3_targ[i] + err_src); |
83 | std_err_main = readl(l3_targ_base + | 84 | std_err_main = __raw_readl(l3_targ_base + |
84 | L3_TARG_STDERRLOG_MAIN); | 85 | L3_TARG_STDERRLOG_MAIN); |
85 | 86 | ||
86 | switch (std_err_main & CUSTOM_ERROR) { | 87 | switch (std_err_main & CUSTOM_ERROR) { |
@@ -89,7 +90,7 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3) | |||
89 | l3_targ_inst_name[i][err_src]; | 90 | l3_targ_inst_name[i][err_src]; |
90 | WARN(true, "L3 standard error: SOURCE:%s at address 0x%x\n", | 91 | WARN(true, "L3 standard error: SOURCE:%s at address 0x%x\n", |
91 | source_name, | 92 | source_name, |
92 | readl(l3_targ_base + | 93 | __raw_readl(l3_targ_base + |
93 | L3_TARG_STDERRLOG_SLVOFSLSB)); | 94 | L3_TARG_STDERRLOG_SLVOFSLSB)); |
94 | /* clear the std error log*/ | 95 | /* clear the std error log*/ |
95 | clear = std_err_main | CLEAR_STDERR_LOG; | 96 | clear = std_err_main | CLEAR_STDERR_LOG; |