power: properly initialize cluster states
authorJan Altensen <info@stricted.net>
Sun, 22 Sep 2019 21:50:37 +0000 (23:50 +0200)
committerJan Altensen <info@stricted.net>
Thu, 9 Apr 2020 14:40:38 +0000 (16:40 +0200)
this fixes the following error
hardware/samsung/power/power.c:415:51: error: excess elements in array initializer [-Werror]
    char ON[CLUSTER_COUNT][PARAM_MAXLEN]  = {"1", "1"};

when only one cluster is defined

Change-Id: I49f88297afb8d57d8abd309e22fa667134b7e406

power/power.c

index f9b268c184d569d4c0f890a7b8933def4a29a6ab..bf861b42e52a5a566f7f7907af1f2cfc884582fe 100644 (file)
@@ -167,13 +167,13 @@ static void cpu_interactive_read(const char *param, char s[CLUSTER_COUNT][PARAM_
     }
 }
 
-static void cpu_interactive_write(const char *param, char s[CLUSTER_COUNT][PARAM_MAXLEN])
+static void cpu_interactive_write(const char *param, char *s)
 {
     char path[PATH_MAX];
 
     for (unsigned int i = 0; i < ARRAY_SIZE(CPU_INTERACTIVE_PATHS); i++) {
         sprintf(path, "%s%s", CPU_INTERACTIVE_PATHS[i], param);
-        sysfs_write(path, s[i]);
+        sysfs_write(path, s);
     }
 }
 
@@ -416,8 +416,6 @@ static void samsung_power_set_interactive(struct power_module *module, int on)
     char button_state[2];
     int rc;
     static bool touchkeys_blocked = false;
-    char ON[CLUSTER_COUNT][PARAM_MAXLEN]  = {"1", "1"};
-    char OFF[CLUSTER_COUNT][PARAM_MAXLEN] = {"0", "0"};
 
     ALOGV("power_set_interactive: %d", on);
 
@@ -469,7 +467,7 @@ static void samsung_power_set_interactive(struct power_module *module, int on)
     }
 
 out:
-    cpu_interactive_write(IO_IS_BUSY_PATH, on ? ON : OFF);
+    cpu_interactive_write(IO_IS_BUSY_PATH, on ? "1" : "0");
 
     ALOGV("power_set_interactive: %d done", on);
 }