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: 106720 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2496786qge; Fri, 30 Jun 2017 08:46:10 -0700 (PDT) X-Received: by 10.84.231.134 with SMTP id g6mr14911857plk.241.1498837570765; Fri, 30 Jun 2017 08:46:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498837570; cv=none; d=google.com; s=arc-20160816; b=UmugHhL75YIrC9l/5KAWoPlxJYvWM7pH959ah2qwR88/mR4zUOJyoRVTqXdeeUYSWF NH1XGOUrpWIwpfN1pjcGj0wvEaifJOikVih+LAdtxy07+na7g6ROEF5UjrKqCJTq6BnW gNunMy2jKvhMbu1dvxz4ZpvK0kzWwQ1L9MmfdlEtpcBbD10fZ4SEZqR8vxVtFJy1kwfK edAtywnnRILMIoN1QBp6u6AXD5Qf7O0uuT255kVjY6SkHSJ3Z9Ym90utSnUr4z9vYWSi EUTPcfwOUwFteriKuUtG/yslFwdWEO/sBwqpP4u5tdR6ZNvj3CPK21Op/u36i+D4pi+a iQ/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=UjOht8vuChxMGmJYVCQEEtkGi6K+vcM8Vi+U96mlGtc=; b=Mrzj+wPjpnBaMcia8CVNbVkphHvNqDtoBH8OWal0ShOhVeQCbuNo7+k0z/qmluQVkd U7J785WLLpHbc79GktGWamB5SOMpEpH8BTr2dglVOWA3eo9Yj9bY7b7+ynztRbIkmQRw fJr5UOie0VZe3Vf5LxqDn8vt8QJ75V3A3Kff9N3rsInnygJ6NvUkeUNjays4Ffpz9+hr 58aHSOAuZATi8k6UPLXfgqsv7ff4ZcUvtplPFRj5I7afvX3054xxeK6GEOUPjI6m042h OxNIz6gpRWGDikKwnI1u+1W3EMma+V5Qn6vlFDb0iPyoOuvosN9iiDwCnyUEhm4Dj3DS II2w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u10si5892213pgb.536.2017.06.30.08.46.10; Fri, 30 Jun 2017 08:46:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752000AbdF3Pp6 (ORCPT + 25 others); Fri, 30 Jun 2017 11:45:58 -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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.9.0 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 */