Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3aa51fe authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

acpi: fix sparse const errors 



In this case we want a constant pointer to constant chars:

drivers/misc/thinkpad_acpi.c:3824:19: error: Just how const do you want this type to be?

Like the error says.

drivers/misc/thinkpad_acpi.c:3863:19: error: Just how const do you want this type to be?
drivers/misc/thinkpad_acpi.c:3864:19: error: Just how const do you want this type to be?
drivers/misc/thinkpad_acpi.c:3865:19: error: Just how const do you want this type to be?
drivers/misc/thinkpad_acpi.c:3866:19: error: Just how const do you want this type to be?

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Acked-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 916941b2

drivers/misc/thinkpad_acpi.c

+5 −5
Original line number Diff line number Diff line
@@ -3821,7 +3821,7 @@ TPACPI_HANDLE(led, ec, "SLED", /* 570 */ 
#define TPACPI_LED_NUMLEDS 8

static struct tpacpi_led_classdev *tpacpi_leds;

static enum led_status_t tpacpi_led_state_cache[TPACPI_LED_NUMLEDS];

static const char const *tpacpi_led_names[TPACPI_LED_NUMLEDS] = {

static const char * const tpacpi_led_names[TPACPI_LED_NUMLEDS] = {

	/* there's a limit of 19 chars + NULL before 2.6.26 */

	"tpacpi::power",

	"tpacpi:orange:batt",
@@ -3860,10 +3860,10 @@ static int led_get_status(unsigned int led) 
static int led_set_status(unsigned int led, enum led_status_t ledstatus)

{

	/* off, on, blink. Index is led_status_t */

	static const int const led_sled_arg1[] = { 0, 1, 3 };

	static const int const led_exp_hlbl[] = { 0, 0, 1 };	/* led# * */

	static const int const led_exp_hlcl[] = { 0, 1, 1 };	/* led# * */

	static const int const led_led_arg1[] = { 0, 0x80, 0xc0 };

	static const int led_sled_arg1[] = { 0, 1, 3 };

	static const int led_exp_hlbl[] = { 0, 0, 1 };	/* led# * */

	static const int led_exp_hlcl[] = { 0, 1, 1 };	/* led# * */

	static const int led_led_arg1[] = { 0, 0x80, 0xc0 };



	int rc = 0;