[PATCH] ARM: pxa: make matrix_keymap_data const
Make these const as they are only stored in the const fields of
pxa27x_keypad_platform_data or matrix_keypad_platform_data structures.
Done using Coccinelle:
@match disable optional_qualifier@
identifier s;
@@
static struct matrix_keymap_data s = {...};
@ref@
position p;
identifier match.s;
@@
s@p
@good1@
identifier y;
position ref.p;
identifier match.s;
@@
struct matrix_keypad_platform_data y = {...,.keymap_data=@p,...};
@good2@
struct matrix_keypad_platform_data y;
identifier match.s;
position ref.p;
@@
y.keymap_data = @p
@good3@
identifier y;
position ref.p;
identifier match.s;
@@
struct pxa27x_keypad_platform_data y =
{...,.matrix_keymap_data=@p,...};
@good4@
struct pxa27x_keypad_platform_data y;
identifier match.s;
position ref.p;
@@
y.matrix_keymap_data = @p
@bad depends on !good1 && !good2 && !good3 && !good4@
position ref.p;
identifier match.s;
@@
s@p
@depends on forall !bad disable optional_qualifier@
identifier match.s;
@@
static
+ const
struct matrix_keymap_data s;
Signed-off-by: Bhumika Goyal
---
arch/arm/mach-pxa/corgi.c | 2 +-
arch/arm/mach-pxa/em-x270.c | 4 ++--
arch/arm/mach-pxa/ezx.c | 12 ++--
arch/arm/mach-pxa/littleton.c | 2 +-
arch/arm/mach-pxa/mainstone.c | 2 +-
arch/arm/mach-pxa/mioa701.c | 2 +-
arch/arm/mach-pxa/palmld.c| 2 +-
arch/arm/mach-pxa/palmt5.c| 2 +-
arch/arm/mach-pxa/palmtreo.c | 4 ++--
arch/arm/mach-pxa/palmtx.c| 2 +-
arch/arm/mach-pxa/palmz72.c | 2 +-
arch/arm/mach-pxa/tavorevb.c | 2 +-
arch/arm/mach-pxa/tosa.c | 2 +-
arch/arm/mach-pxa/z2.c| 2 +-
arch/arm/mach-pxa/zylonite.c | 2 +-
15 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index 7270f0d..4393b9b 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -380,7 +380,7 @@ struct platform_device corgiscoop_device = {
KEY(7, 4, CORGI_KEY_EXJOGUP),
};
-static struct matrix_keymap_data corgikbd_keymap_data = {
+static const struct matrix_keymap_data corgikbd_keymap_data = {
.keymap = corgikbd_keymap,
.keymap_size= ARRAY_SIZE(corgikbd_keymap),
};
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index 811a731..8619140 100644
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -846,7 +846,7 @@ static inline void em_x270_init_ac97(void) {}
KEY(0, 1, KEY_C), KEY(1, 2, KEY_DOWN), KEY(2, 2, KEY_D),
};
-static struct matrix_keymap_data em_x270_matrix_keymap_data = {
+static const struct matrix_keymap_data em_x270_matrix_keymap_data = {
.keymap = em_x270_module_matrix_keys,
.keymap_size= ARRAY_SIZE(em_x270_module_matrix_keys),
};
@@ -900,7 +900,7 @@ struct pxa27x_keypad_platform_data
em_x270_module_keypad_info = {
KEY(7, 6, 0), KEY(7, 7, 0),
};
-static struct matrix_keymap_data em_x270_exeda_matrix_keymap_data = {
+static const struct matrix_keymap_data em_x270_exeda_matrix_keymap_data = {
.keymap = em_x270_exeda_matrix_keys,
.keymap_size= ARRAY_SIZE(em_x270_exeda_matrix_keys),
};
diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c
index a057cf9..e87f137 100644
--- a/arch/arm/mach-pxa/ezx.c
+++ b/arch/arm/mach-pxa/ezx.c
@@ -429,7 +429,7 @@
KEY(4, 4, KEY_DOWN),
};
-static struct matrix_keymap_data a780_matrix_keymap_data = {
+static const struct matrix_keymap_data a780_matrix_keymap_data = {
.keymap = a780_key_map,
.keymap_size= ARRAY_SIZE(a780_key_map),
};
@@ -464,7 +464,7 @@
KEY(2, 3, KEY_KPENTER),
};
-static struct matrix_keymap_data e680_matrix_keymap_data = {
+static const struct matrix_keymap_data e680_matrix_keymap_data = {
.keymap = e680_key_map,
.keymap_size= ARRAY_SIZE(e680_key_map),
};
@@ -526,7 +526,7 @@
KEY(4, 5, KEY_RESERVED),
};
-static struct matrix_keymap_data a1200_matrix_keymap_data = {
+static const struct matrix_keymap_data a1200_matrix_keymap_data = {
.keymap = a1200_key_map,
.keymap_size= ARRAY_SIZE(a1200_key_map),
};
@@ -578,7 +578,7 @@
KEY(4, 5, KEY_PREVIOUSSONG),
};
-static struct matrix_keymap_data e6_keymap_data = {
+static const struct matrix_keymap_data e6_keymap_data = {
.keymap = e6_key_map,
.keymap_size= ARRAY_SIZE(e6_key_map),
};
@@ -630,7 +630,7 @@
KEY(4, 5, KEY_RESERVED),
};
-static struct matrix_keymap_data a910_matrix_keymap_data = {
+static const struct matrix_keymap_data a910_matrix_keymap_data = {
.keymap = a910_key_map,
.keymap_size= ARRAY_SIZE(a910_key_map),
};
@@ -682,7 +682,7 @@
KEY(4, 5, KEY_RESERVED),
};
-static struct matrix_keymap_data e2_matrix_keymap_data = {
+static const struct matrix_keymap_data
[PATCH] ARM: pxa: make matrix_keymap_data const
Make these const as they are only stored in the const fields of
pxa27x_keypad_platform_data or matrix_keypad_platform_data structures.
Done using Coccinelle:
@match disable optional_qualifier@
identifier s;
@@
static struct matrix_keymap_data s = {...};
@ref@
position p;
identifier match.s;
@@
s@p
@good1@
identifier y;
position ref.p;
identifier match.s;
@@
struct matrix_keypad_platform_data y = {...,.keymap_data=@p,...};
@good2@
struct matrix_keypad_platform_data y;
identifier match.s;
position ref.p;
@@
y.keymap_data = @p
@good3@
identifier y;
position ref.p;
identifier match.s;
@@
struct pxa27x_keypad_platform_data y =
{...,.matrix_keymap_data=@p,...};
@good4@
struct pxa27x_keypad_platform_data y;
identifier match.s;
position ref.p;
@@
y.matrix_keymap_data = @p
@bad depends on !good1 && !good2 && !good3 && !good4@
position ref.p;
identifier match.s;
@@
s@p
@depends on forall !bad disable optional_qualifier@
identifier match.s;
@@
static
+ const
struct matrix_keymap_data s;
Signed-off-by: Bhumika Goyal
---
arch/arm/mach-pxa/corgi.c | 2 +-
arch/arm/mach-pxa/em-x270.c | 4 ++--
arch/arm/mach-pxa/ezx.c | 12 ++--
arch/arm/mach-pxa/littleton.c | 2 +-
arch/arm/mach-pxa/mainstone.c | 2 +-
arch/arm/mach-pxa/mioa701.c | 2 +-
arch/arm/mach-pxa/palmld.c| 2 +-
arch/arm/mach-pxa/palmt5.c| 2 +-
arch/arm/mach-pxa/palmtreo.c | 4 ++--
arch/arm/mach-pxa/palmtx.c| 2 +-
arch/arm/mach-pxa/palmz72.c | 2 +-
arch/arm/mach-pxa/tavorevb.c | 2 +-
arch/arm/mach-pxa/tosa.c | 2 +-
arch/arm/mach-pxa/z2.c| 2 +-
arch/arm/mach-pxa/zylonite.c | 2 +-
15 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index 7270f0d..4393b9b 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -380,7 +380,7 @@ struct platform_device corgiscoop_device = {
KEY(7, 4, CORGI_KEY_EXJOGUP),
};
-static struct matrix_keymap_data corgikbd_keymap_data = {
+static const struct matrix_keymap_data corgikbd_keymap_data = {
.keymap = corgikbd_keymap,
.keymap_size= ARRAY_SIZE(corgikbd_keymap),
};
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index 811a731..8619140 100644
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -846,7 +846,7 @@ static inline void em_x270_init_ac97(void) {}
KEY(0, 1, KEY_C), KEY(1, 2, KEY_DOWN), KEY(2, 2, KEY_D),
};
-static struct matrix_keymap_data em_x270_matrix_keymap_data = {
+static const struct matrix_keymap_data em_x270_matrix_keymap_data = {
.keymap = em_x270_module_matrix_keys,
.keymap_size= ARRAY_SIZE(em_x270_module_matrix_keys),
};
@@ -900,7 +900,7 @@ struct pxa27x_keypad_platform_data
em_x270_module_keypad_info = {
KEY(7, 6, 0), KEY(7, 7, 0),
};
-static struct matrix_keymap_data em_x270_exeda_matrix_keymap_data = {
+static const struct matrix_keymap_data em_x270_exeda_matrix_keymap_data = {
.keymap = em_x270_exeda_matrix_keys,
.keymap_size= ARRAY_SIZE(em_x270_exeda_matrix_keys),
};
diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c
index a057cf9..e87f137 100644
--- a/arch/arm/mach-pxa/ezx.c
+++ b/arch/arm/mach-pxa/ezx.c
@@ -429,7 +429,7 @@
KEY(4, 4, KEY_DOWN),
};
-static struct matrix_keymap_data a780_matrix_keymap_data = {
+static const struct matrix_keymap_data a780_matrix_keymap_data = {
.keymap = a780_key_map,
.keymap_size= ARRAY_SIZE(a780_key_map),
};
@@ -464,7 +464,7 @@
KEY(2, 3, KEY_KPENTER),
};
-static struct matrix_keymap_data e680_matrix_keymap_data = {
+static const struct matrix_keymap_data e680_matrix_keymap_data = {
.keymap = e680_key_map,
.keymap_size= ARRAY_SIZE(e680_key_map),
};
@@ -526,7 +526,7 @@
KEY(4, 5, KEY_RESERVED),
};
-static struct matrix_keymap_data a1200_matrix_keymap_data = {
+static const struct matrix_keymap_data a1200_matrix_keymap_data = {
.keymap = a1200_key_map,
.keymap_size= ARRAY_SIZE(a1200_key_map),
};
@@ -578,7 +578,7 @@
KEY(4, 5, KEY_PREVIOUSSONG),
};
-static struct matrix_keymap_data e6_keymap_data = {
+static const struct matrix_keymap_data e6_keymap_data = {
.keymap = e6_key_map,
.keymap_size= ARRAY_SIZE(e6_key_map),
};
@@ -630,7 +630,7 @@
KEY(4, 5, KEY_RESERVED),
};
-static struct matrix_keymap_data a910_matrix_keymap_data = {
+static const struct matrix_keymap_data a910_matrix_keymap_data = {
.keymap = a910_key_map,
.keymap_size= ARRAY_SIZE(a910_key_map),
};
@@ -682,7 +682,7 @@
KEY(4, 5, KEY_RESERVED),
};
-static struct matrix_keymap_data e2_matrix_keymap_data = {
+static const struct matrix_keymap_data
