diff options
author | Barry Song <Baohua.Song@csr.com> | 2014-02-18 01:46:27 -0500 |
---|---|---|
committer | Barry Song <Baohua.Song@csr.com> | 2014-03-04 21:20:25 -0500 |
commit | c2ed0f3615116654bfa181566dc6a1cdec1f05c3 (patch) | |
tree | 4f056bcbfc9f43d4ced617fc10dcddebbc93ead8 /arch | |
parent | 38dbfb59d1175ef458d006556061adeaa8751b72 (diff) |
ARM: prima2: l2x0: fix checkpatch issues
Fix the below checkpatch issues:
ERROR: open brace '{' following struct go on the same line
15: FILE: l2x0.c:15:
+struct l2x0_aux
+{
ERROR: Use of __initconst requires a separate use of const
20: FILE: l2x0.c:20:
+static struct l2x0_aux prima2_l2x0_aux __initconst = {
ERROR: Use of __initconst requires a separate use of const
25: FILE: l2x0.c:25:
+static struct l2x0_aux marco_l2x0_aux __initconst = {
ERROR: Use of __initconst requires a separate use of const
31: FILE: l2x0.c:31:
+static struct of_device_id sirf_l2x0_ids[] __initconst = {
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-prima2/l2x0.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-prima2/l2x0.c b/arch/arm/mach-prima2/l2x0.c index cbcbe9cb094c..c7102539c0b0 100644 --- a/arch/arm/mach-prima2/l2x0.c +++ b/arch/arm/mach-prima2/l2x0.c | |||
@@ -11,24 +11,23 @@ | |||
11 | #include <linux/of.h> | 11 | #include <linux/of.h> |
12 | #include <asm/hardware/cache-l2x0.h> | 12 | #include <asm/hardware/cache-l2x0.h> |
13 | 13 | ||
14 | struct l2x0_aux | 14 | struct l2x0_aux { |
15 | { | ||
16 | u32 val; | 15 | u32 val; |
17 | u32 mask; | 16 | u32 mask; |
18 | }; | 17 | }; |
19 | 18 | ||
20 | static struct l2x0_aux prima2_l2x0_aux __initconst = { | 19 | static const struct l2x0_aux prima2_l2x0_aux __initconst = { |
21 | .val = 2 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT, | 20 | .val = 2 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT, |
22 | .mask = 0, | 21 | .mask = 0, |
23 | }; | 22 | }; |
24 | 23 | ||
25 | static struct l2x0_aux marco_l2x0_aux __initconst = { | 24 | static const struct l2x0_aux marco_l2x0_aux __initconst = { |
26 | .val = (2 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT) | | 25 | .val = (2 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT) | |
27 | (1 << L2X0_AUX_CTRL_ASSOCIATIVITY_SHIFT), | 26 | (1 << L2X0_AUX_CTRL_ASSOCIATIVITY_SHIFT), |
28 | .mask = L2X0_AUX_CTRL_MASK, | 27 | .mask = L2X0_AUX_CTRL_MASK, |
29 | }; | 28 | }; |
30 | 29 | ||
31 | static struct of_device_id sirf_l2x0_ids[] __initconst = { | 30 | static const struct of_device_id sirf_l2x0_ids[] __initconst = { |
32 | { .compatible = "sirf,prima2-pl310-cache", .data = &prima2_l2x0_aux, }, | 31 | { .compatible = "sirf,prima2-pl310-cache", .data = &prima2_l2x0_aux, }, |
33 | { .compatible = "sirf,marco-pl310-cache", .data = &marco_l2x0_aux, }, | 32 | { .compatible = "sirf,marco-pl310-cache", .data = &marco_l2x0_aux, }, |
34 | {}, | 33 | {}, |