[PATCH 71/71] staging: unisys: static const chars visorchipset_main.c

Jeffrey Brown Jeffrey.Brown at unisys.com
Wed Nov 12 17:42:56 UTC 2014


From: Jeffrey <Jeffrey.Brown at unisys.com>

Switched chars* arrays to static const char * const in visorchipset
_main.c
1020: char *envp[] => static const char * const envp[]
1490: char env_selftest => static const char env_selftext
1491: char envp[] => static const char * const envp[]
1645: char env_cmd => static const char
1647: char envp => static const char * const envp

Signed-off-by: Jeffrey Brown <Jeffrey.Brown at unisys.com>
---
 drivers/staging/unisys/visorchipset/visorchipset_main.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index 45b1760..314a3a2 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -1017,7 +1017,7 @@ device_epilog(u32 busno, u32 devno, struct spar_segment_state state, u32 cmd,
 
 	struct visorchipset_device_info *pdevinfo =
 		finddevice(&devinfolist, busno, devno);
-	char *envp[] = {
+	static const char * const envp[] = {
 		"SPARSP_DIAGPOOL_PAUSED_STATE = 1",
 		NULL
 	};
@@ -1487,8 +1487,8 @@ EXPORT_SYMBOL_GPL(visorchipset_chipset_ready);
 int
 visorchipset_chipset_selftest(void)
 {
-	char env_selftest[20];
-	char *envp[] = { env_selftest, NULL };
+	static const char env_selftest[20];
+	static const char * const envp[] = { env_selftest, NULL };
 
 	sprintf(env_selftest, "SPARSP_SELFTEST=%d", 1);
 	kobject_uevent_env(&visorchipset_platform_device.dev.kobj, KOBJ_CHANGE,
@@ -1642,9 +1642,9 @@ static void
 parahotplug_request_kickoff(struct parahotplug_request *req)
 {
 	struct controlvm_message_packet *cmd = &req->msg.cmd;
-	char env_cmd[40], env_id[40], env_state[40], env_bus[40], env_dev[40],
-	    env_func[40];
-	char *envp[] = {
+	static const char env_cmd[40], env_id[40], env_state[40], env_bus[40],
+	    env_dev[40], env_func[40];
+	static const char * const envp[] = {
 		env_cmd, env_id, env_state, env_bus, env_dev, env_func, NULL
 	};
 
-- 
1.8.4



More information about the devel mailing list