Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

power: test_power: Use enum as index for array of supplies

Replace hard-coded numbers for indices of power supply array with enum.
This improves a little the readability as one does not have to guess
which power supply is associated with number.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>

authored by

Krzysztof Kozlowski and committed by
Sebastian Reichel
a30067bb 24d3b15a

+22 -11
+22 -11
drivers/power/test_power.c
··· 21 21 #include <linux/delay.h> 22 22 #include <linux/vermagic.h> 23 23 24 + enum test_power_id { 25 + TEST_AC, 26 + TEST_BATTERY, 27 + TEST_USB, 28 + TEST_POWER_NUM, 29 + }; 30 + 24 31 static int ac_online = 1; 25 32 static int usb_online = 1; 26 33 static int battery_status = POWER_SUPPLY_STATUS_DISCHARGING; ··· 154 147 }; 155 148 156 149 static struct power_supply test_power_supplies[] = { 157 - { 150 + [TEST_AC] = { 158 151 .name = "test_ac", 159 152 .type = POWER_SUPPLY_TYPE_MAINS, 160 153 .supplied_to = test_power_ac_supplied_to, ··· 162 155 .properties = test_power_ac_props, 163 156 .num_properties = ARRAY_SIZE(test_power_ac_props), 164 157 .get_property = test_power_get_ac_property, 165 - }, { 158 + }, 159 + [TEST_BATTERY] = { 166 160 .name = "test_battery", 167 161 .type = POWER_SUPPLY_TYPE_BATTERY, 168 162 .properties = test_power_battery_props, 169 163 .num_properties = ARRAY_SIZE(test_power_battery_props), 170 164 .get_property = test_power_get_battery_property, 171 - }, { 165 + }, 166 + [TEST_USB] = { 172 167 .name = "test_usb", 173 168 .type = POWER_SUPPLY_TYPE_USB, 174 169 .supplied_to = test_power_ac_supplied_to, ··· 186 177 { 187 178 int i; 188 179 int ret; 180 + 181 + BUILD_BUG_ON(TEST_POWER_NUM != ARRAY_SIZE(test_power_supplies)); 189 182 190 183 for (i = 0; i < ARRAY_SIZE(test_power_supplies); i++) { 191 184 ret = power_supply_register(NULL, &test_power_supplies[i]); ··· 320 309 static int param_set_ac_online(const char *key, const struct kernel_param *kp) 321 310 { 322 311 ac_online = map_get_value(map_ac_online, key, ac_online); 323 - signal_power_supply_changed(&test_power_supplies[0]); 312 + signal_power_supply_changed(&test_power_supplies[TEST_AC]); 324 313 return 0; 325 314 } 326 315 ··· 333 322 static int param_set_usb_online(const char *key, const struct kernel_param *kp) 334 323 { 335 324 usb_online = map_get_value(map_ac_online, key, usb_online); 336 - signal_power_supply_changed(&test_power_supplies[2]); 325 + signal_power_supply_changed(&test_power_supplies[TEST_USB]); 337 326 return 0; 338 327 } 339 328 ··· 347 336 const struct kernel_param *kp) 348 337 { 349 338 battery_status = map_get_value(map_status, key, battery_status); 350 - signal_power_supply_changed(&test_power_supplies[1]); 339 + signal_power_supply_changed(&test_power_supplies[TEST_BATTERY]); 351 340 return 0; 352 341 } 353 342 ··· 361 350 const struct kernel_param *kp) 362 351 { 363 352 battery_health = map_get_value(map_health, key, battery_health); 364 - signal_power_supply_changed(&test_power_supplies[1]); 353 + signal_power_supply_changed(&test_power_supplies[TEST_BATTERY]); 365 354 return 0; 366 355 } 367 356 ··· 375 364 const struct kernel_param *kp) 376 365 { 377 366 battery_present = map_get_value(map_present, key, battery_present); 378 - signal_power_supply_changed(&test_power_supplies[0]); 367 + signal_power_supply_changed(&test_power_supplies[TEST_AC]); 379 368 return 0; 380 369 } 381 370 ··· 391 380 { 392 381 battery_technology = map_get_value(map_technology, key, 393 382 battery_technology); 394 - signal_power_supply_changed(&test_power_supplies[1]); 383 + signal_power_supply_changed(&test_power_supplies[TEST_BATTERY]); 395 384 return 0; 396 385 } 397 386 ··· 412 401 return -EINVAL; 413 402 414 403 battery_capacity = tmp; 415 - signal_power_supply_changed(&test_power_supplies[1]); 404 + signal_power_supply_changed(&test_power_supplies[TEST_BATTERY]); 416 405 return 0; 417 406 } 418 407 ··· 427 416 return -EINVAL; 428 417 429 418 battery_voltage = tmp; 430 - signal_power_supply_changed(&test_power_supplies[1]); 419 + signal_power_supply_changed(&test_power_supplies[TEST_BATTERY]); 431 420 return 0; 432 421 } 433 422