From patchwork Fri Jun 30 15:45:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9819881 X-Patchwork-Delegate: andy.shevchenko@gmail.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D3173602B1 for ; Fri, 30 Jun 2017 15:45:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D1D6725F3E for ; Fri, 30 Jun 2017 15:45:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C463A2856B; Fri, 30 Jun 2017 15:45:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2279025F3E for ; Fri, 30 Jun 2017 15:45:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751729AbdF3Pp5 (ORCPT ); Fri, 30 Jun 2017 11:45:57 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:51614 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751701AbdF3Pp4 (ORCPT ); Fri, 30 Jun 2017 11:45:56 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0M5cGS-1dgQco07Ro-00xYGG; Fri, 30 Jun 2017 17:45:26 +0200 From: Arnd Bergmann To: Andy Shevchenko Cc: Arnd Bergmann , Mattia Dongili , Darren Hart , Arvind Yadav , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] platform/x86: sony-laptop: revert 'const' on keymap Date: Fri, 30 Jun 2017 17:45:09 +0200 Message-Id: <20170630154524.3611399-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:PVJR7rhVp87l/RLWkBlenyvteYTeFmDANXh91yH+OjIN9d2gOf/ UvBEHrWdmYYOS/7Sy3s+Uw6g5T2V6i5d4gj0QtvmoASVmPpupkgse15nPZ3D4e38xcxqdl0 ABDw8y4I8sEz5+3pAL2VvUH4U3a0HIKp2I/teZMOdWtgy2rOBxgRzpxq6aMsn4AZAdR0QmO giULOhtI4N+2Bjnk6btKw== X-UI-Out-Filterresults: notjunk:1; V01:K0:QsKVxw5vBCA=:3nH6cjZSHYfxvJD+h/W1VP e6ZmWYgCfueJn1JG7gsxvtwXQ5QrZ8+YHli0CcaRUtctNXn0OC43csc7nNzeI1Cmv7xxmkYqZ Q+VYbYM3n6xbYsOuujoCU0DQdyAOZEuDu223u99EafO9SLk9OVM3ZmqOtZQo4yRL7XPFu7NxX buX4XH3p2JOQwo9WW5mf3T+gTkeFi6uJ2dC9H+kB6HKTjOy8SdcXsnL9Xm7/Uf9xYz26jriNc Sp+YlT+ZVUvZv56P9TCwvJFaCSbtONzPo2Iaf/IdJvkVP3MwM67NCcKjYmXW10T9S853kAjJj yXBByh6zfbWdCpW+7mSpzIcwixizwz3K0nc2XhLNslG5RyLdmr06ZNOSxl5U44fQLtMilNrs6 qWrVMEcQH+27cVN2B06yaBYF62kbE0I7D1jvoP3KHocbrojJwud2CXQz+Mtx5ccVmrTSjKFg9 +KZV1ryg5KuFRAU77Hp9iAHZ5j8kIbhBgXYzNlt2CRO7Ux4KKN70wrPDK8dfLIBNLjROfwgTJ U5wAtH3TJwEr4bFAhn1s9EWJJ3cyeLqQ8QCE9YGmXdcs8h5JCPRa6aDBhy0LfvgcyX6vNvuz8 IbzZQWRc0zOtMr10QswmLMS4amUVyZZ3PRiMHvd+Wmha1W6I79VGnYadF2i6nBxz2E0YINdCX Q4Dy2gCMepRadrAEvAUJBL4eDJFmoPXK0IwTsiM65fOPpnpZu09gOrvtN77GYGDSsZdo= Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 */