Skip to contentSkip to conversation

Staging: unisys: Change char * array type as static const

PATCH Superseded aybuke ozdemir 2 participants 3 messages Feb 23, 2015 – Feb 24, 2015 Staging

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: unisys: Change char * array type as static const

This patch fixes "char * array declaration might be better as static const" checkpatch.pl warning in visorchipset_main.c
After this exchange that can be accessed pointer, without object derived from the instance but just just read operation can be done in pointer.

---
 drivers/staging/unisys/visorchipset/visorchipset_main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/unisys/visorchipset/visorchipset_main.c +3 -3
index f606ee9..9f25c7f 100644
@@ -1009,7 +1009,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 char const *envp[] = {
 		"SPARSP_DIAGPOOL_PAUSED_STATE = 1",
 		NULL
 	};
@@ -1481,7 +1481,7 @@ int
 visorchipset_chipset_selftest(void)
 {
 	char env_selftest[20];
-	char *envp[] = { env_selftest, NULL };
+	static char const *envp[] = { env_selftest, NULL };
 
 	sprintf(env_selftest, "SPARSP_SELFTEST=%d", 1);
 	kobject_uevent_env(&Visorchipset_platform_device.dev.kobj, KOBJ_CHANGE,
@@ -1637,7 +1637,7 @@ 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 char const *envp[] = {
 		env_cmd, env_id, env_state, env_bus, env_dev, env_func, NULL
 	};
 
Signature · 1 line
1.9.1
#1 lore raw

drivers/staging/unisys/visorchipset/visorchipset_main.c int · line 1487

Quoted 9 lines · On Tuesday 24 February 2015 00:12:45 aybuke ozdemir wrote:
drivers/staging/unisys/visorchipset/visorchipset_main.c +1 -1
@@ -1481,7 +1481,7 @@ int
 visorchipset_chipset_selftest(void)
 {
        char env_selftest[20];
-       char *envp[] = { env_selftest, NULL };
+       static char const *envp[] = { env_selftest, NULL };
 
        sprintf(env_selftest, "SPARSP_SELFTEST=%d", 1);
        kobject_uevent_env(&Visorchipset_platform_device.dev.kobj, KOBJ_CHANGE,

Did you mean 'static const char *const envp[]'?

drivers/staging/unisys/visorchipset/visorchipset_main.c parahotplug_request_kickoff(struct parahotplug_request *req) · line 1642

Quoted 8 lines
drivers/staging/unisys/visorchipset/visorchipset_main.c +1 -1
@@ -1637,7 +1637,7 @@ 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 char const *envp[] = {
                env_cmd, env_id, env_state, env_bus, env_dev, env_func, NULL
        };

The actual strings are not const here, and the pointers point to objects on the stack, so what does this change accomplish?

Arnd

#2 lore raw

Hi,

I've only changed the pointer, I made it const. I should use it like you said(static const char *const). Because I can't do const string.

I'll make changes you said and send it again.

Regards