lkml.org 
[lkml]   [2017]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] platform/x86: sony-laptop: revert 'const' on keymap
Date
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")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/platform/x86/sony-laptop.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 5fc20473d51e..bfae79534f44 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -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
\
 
 \ /
  Last update: 2017-06-30 23:14    [W:0.052 / U:1.168 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site