Skip to contentSkip to conversation

platform/x86: sony-laptop: revert 'const' on keymap

PATCH In review Arnd Bergmann 3 participants 5 messages Jun 30, 2017 – Jul 1, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 platform/x86: sony-laptop: revert 'const' on keymap

Marking sony_laptop_input_keycode_map 'const' sounds like a good idea in principle, but unfortunately causes a compiler warning:

drivers/platform/x86/sony-laptop.c: In function 'sony_laptop_setup_input':
drivers/platform/x86/sony-laptop.c:494:19: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-array-qualifiers]

This reverts that part of the previous cleanup patch.

Fixes a0f0a5e1978b ("platform/x86: sony-laptop: constify few static structures")
---
 drivers/platform/x86/sony-laptop.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/sony-laptop.c +1 -1
index 5fc20473d51e..bfae79534f44 100644
@@ -299,7 +299,7 @@ static const int sony_laptop_input_index[] = {
 	59,	/* 72 SONYPI_EVENT_VENDOR_PRESSED */
 };
 
-static const int sony_laptop_input_keycode_map[] = {
+static int sony_laptop_input_keycode_map[] = {
 	KEY_CAMERA,	/*  0 SONYPI_EVENT_CAPTURE_PRESSED */
 	KEY_RESERVED,	/*  1 SONYPI_EVENT_CAPTURE_RELEASED */
 	KEY_RESERVED,	/*  2 SONYPI_EVENT_CAPTURE_PARTIALPRESSED */
Signature · 1 line
2.9.0
#1 lore raw
Quoted 7 lines · Arnd Bergmann

Marking sony_laptop_input_keycode_map 'const' sounds like a good idea in principle, but unfortunately causes a compiler warning:

drivers/platform/x86/sony-laptop.c: In function 'sony_laptop_setup_input':
drivers/platform/x86/sony-laptop.c:494:19: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-array-qualifiers]

This reverts that part of the previous cleanup patch.

Thanks, pushed directly to for-next.

I didn't get a clear result from our 0day kbuild bot, so it was in testing previously.

Darren, it looks like we need more clear coordination on what is going to be applied for-next from testing.

Quoted 23 lines
Fixes a0f0a5e1978b ("platform/x86: sony-laptop: constify few static structures")
---
 drivers/platform/x86/sony-laptop.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/sony-laptop.c +1 -2
index 5fc20473d51e..bfae79534f44 100644
@@ -299,7 +299,7 @@ static const int sony_laptop_input_index[] = {
        59,     /* 72 SONYPI_EVENT_VENDOR_PRESSED */
 };
 
-static const int sony_laptop_input_keycode_map[] = {
+static int sony_laptop_input_keycode_map[] = {
        KEY_CAMERA,     /*  0 SONYPI_EVENT_CAPTURE_PRESSED */
        KEY_RESERVED,   /*  1 SONYPI_EVENT_CAPTURE_RELEASED */
        KEY_RESERVED,   /*  2 SONYPI_EVENT_CAPTURE_PARTIALPRESSED */
--

2.9.0

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#2 lore raw
Quoted 11 lines · Andy Shevchenko
Quoted 7 lines · Arnd Bergmann

Marking sony_laptop_input_keycode_map 'const' sounds like a good idea in principle, but unfortunately causes a compiler warning:

drivers/platform/x86/sony-laptop.c: In function 'sony_laptop_setup_input':
drivers/platform/x86/sony-laptop.c:494:19: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-array-qualifiers]

This reverts that part of the previous cleanup patch.

Thanks, pushed directly to for-next.

Thanks Andy,

Quoted 5 lines

I didn't get a clear result from our 0day kbuild bot, so it was in testing previously.

Darren, it looks like we need more clear coordination on what is going to be applied for-next from testing.

Indeed - and my CI build should have caught this warning. I will look into what it's missing so this would be called out as an error.

And for this patch, I would prefer to roll this into the original. There is no point in introducing warnings into Linus' kernel. We try not to rebase for-next, but it happens everyday, so it isn't a huge deal for Stephen to deal with.

Will you squash it, or shall I?

Signature · 2 lines
Darren Hart
VMware Open Source Technology Center
#3 lore raw
Quoted 4 lines · Darren Hart
Quoted 1 line · Andy Shevchenko

On Fri, Jun 30, 2017 at 6:45 PM, Arnd Bergmann <[email protected]> wrote:

Will you squash it, or shall I?

Please, handle this, thanks!

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#4 lore raw
Quoted 7 lines · Andy Shevchenko
Quoted 4 lines · Darren Hart
Quoted 1 line · Andy Shevchenko

On Fri, Jun 30, 2017 at 6:45 PM, Arnd Bergmann <[email protected]> wrote:

Will you squash it, or shall I?

Please, handle this, thanks!

Done. Thanks all, and apologies for the noise on this one.

Signature · 2 lines
Darren Hart
VMware Open Source Technology Center