From patchwork Mon Apr 23 12:28:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 8037 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 6905823E23 for ; Mon, 23 Apr 2012 12:29:06 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 22EF1A18842 for ; Mon, 23 Apr 2012 12:29:06 +0000 (UTC) Received: by yhpp61 with SMTP id p61so7439254yhp.11 for ; Mon, 23 Apr 2012 05:29:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :x-gm-message-state; bh=ng6/hcMRBE/AQ77ijbYRBwE9pQkDzTbGEQCKY8Mi/68=; b=VUT+sqlDd7J2vNwRSdulr1C8eav15ecq7mtPEup6y4gThKBvJ4rKbJRXQJNpE6KbnE F/XXapAVyo2Ij6mXlkbp+pMhrmNAQ3VQQQZOGv4Ef4kwGa2pES4f7jr8ZMaIXAkN1iaz omRlAspFZmh/tIBA555AfbLn4/OFat4lAtrX6gGzKAG0wfRSPlkw33KN3yjVGGFJc+5n EjMXoCemCYKdCOia2OkrqIPNfFslDEn1pNz+5g2BrwvCj5BIbW7ROFQs/8khcjRKqpcy 9JPpRYKau0mJlELAWXA6JDegAK7flkMkr2VXA/uEV7P33nMAQaRbyNI7hezbG7iA5dqb m6zw== Received: by 10.50.207.38 with SMTP id lt6mr2338223igc.55.1335184145368; Mon, 23 Apr 2012 05:29:05 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.137.198 with SMTP id x6csp108878ibt; Mon, 23 Apr 2012 05:29:04 -0700 (PDT) Received: by 10.14.99.6 with SMTP id w6mr2560854eef.68.1335184143355; Mon, 23 Apr 2012 05:29:03 -0700 (PDT) Received: from eu1sys200aog103.obsmtp.com (eu1sys200aog103.obsmtp.com. [207.126.144.115]) by mx.google.com with SMTP id n8si4350667eef.22.2012.04.23.05.28.55 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 23 Apr 2012 05:29:03 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.115 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.115; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.115 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob103.postini.com ([207.126.147.11]) with SMTP ID DSNKT5VLBgOypgfsV314uW4aK52+sFyZPhn2@postini.com; Mon, 23 Apr 2012 12:29:02 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 8439CB8; Mon, 23 Apr 2012 12:20:28 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 3EEDD152C; Mon, 23 Apr 2012 12:28:50 +0000 (GMT) Received: from exdcvycastm004.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm004", Issuer "exdcvycastm004" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id BD34424C2F1; Mon, 23 Apr 2012 14:28:42 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.2) with Microsoft SMTP Server (TLS) id 8.3.83.0; Mon, 23 Apr 2012 14:28:49 +0200 From: Linus Walleij To: Samuel Ortiz , Cc: Linus Walleij , Dmitry Torokhov Subject: [PATCH] mfd/stmpe: allow for const keyboard data Date: Mon, 23 Apr 2012 14:28:44 +0200 Message-ID: <1335184124-9105-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.9.2 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkMkAzJVcDUoupqYYPZuNK9KIs3pXCSrTbxQOlFiUBL4fX/YUyqv5sYDSDusdE+8zJVdV1e From: Linus Walleij Since it's not like we will re-arrange the keys at run-time, it seems proper to allow the keymap data to be const. This solves a compilation warning in ux500. Cc: Dmitry Torokhov Signed-off-by: Linus Walleij --- include/linux/mfd/stmpe.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/mfd/stmpe.h b/include/linux/mfd/stmpe.h index 8516fd1..f8d5b4d 100644 --- a/include/linux/mfd/stmpe.h +++ b/include/linux/mfd/stmpe.h @@ -117,7 +117,7 @@ struct matrix_keymap_data; * @no_autorepeat: disable key autorepeat */ struct stmpe_keypad_platform_data { - struct matrix_keymap_data *keymap_data; + const struct matrix_keymap_data *keymap_data; unsigned int debounce_ms; unsigned int scan_count; bool no_autorepeat;