From patchwork Thu Sep 3 02:49:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 7114521 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 286AF9F1D5 for ; Thu, 3 Sep 2015 02:49:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3FA51206E9 for ; Thu, 3 Sep 2015 02:49:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2140920340 for ; Thu, 3 Sep 2015 02:49:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756284AbbICCtU (ORCPT ); Wed, 2 Sep 2015 22:49:20 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:47257 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756281AbbICCtT (ORCPT ); Wed, 2 Sep 2015 22:49:19 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie1.idc.renesas.com with ESMTP; 03 Sep 2015 11:49:17 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id ABED145CB1; Thu, 3 Sep 2015 11:49:17 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 8FB05480A4; Thu, 3 Sep 2015 11:49:17 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 88F40480A3; Thu, 3 Sep 2015 11:49:17 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac4.idc.renesas.com with ESMTP id MAF02035; Thu, 3 Sep 2015 11:49:17 +0900 X-IronPort-AV: E=Sophos;i="5.17,458,1437404400"; d="scan'";a="193635860" Received: from mail-sg2apc01lp0248.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.248]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 03 Sep 2015 11:49:16 +0900 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by SG2PR06MB0602.apcprd06.prod.outlook.com (10.161.10.152) with Microsoft SMTP Server (TLS) id 15.1.256.15; Thu, 3 Sep 2015 02:49:14 +0000 Message-ID: <87mvx4qkzo.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 1/9 v2] sh-pfc: modify PINMUX_IPSR_MSEL() macro order User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") To: Linus Walleij , Laurent Pinchart CC: Simon , Magnus , "linux-gpio@vger.kernel.org" , "linux-sh@vger.kernel.org" In-Reply-To: <87oahkql0v.wl%kuninori.morimoto.gx@renesas.com> References: <87oahkql0v.wl%kuninori.morimoto.gx@renesas.com> Date: Thu, 3 Sep 2015 02:49:14 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR0201CA0021.apcprd02.prod.outlook.com (25.164.90.159) To SG2PR06MB0602.apcprd06.prod.outlook.com (25.161.10.152) X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0602; 2:SEpbWN5Fj3cH2OMcK4eGQLu/tMl332TfcAqPbuxnj3Z+mJ22PZPewcH1yQWd/P7Nq0cG/TF7QyL5OEXNByP5spUl1nMjzuIFMnDD0T2kPxxqRUf4V+EO8d3zRTBbNWJ4Z0HOe+hxFrRl3EzVTC3JT5so6iuP85r9fhvYPuj41AU=; 3:QpQ0lsLiRdRomyMamE5qL1sxTE5Ur3TxfyiYAB0g84glpEI2FnZDeskOlAJxzQwWRoEip7dJG8KK9VsJ6jn0fIyWGtCKmd8nJ03qDxrEfyk8APtVveYuD21UdXgGS+iF/KTarwkpLMW68MtWp8Z5KQ==; 25:rSBnV/ghf0j5dJChquhDRxyTrG+EjYsnwdMo9LfcVFTWWnDDg3C+XFgUZS3s5+UQ9ZmQ6UuTtsTK4+mJgljPZmAZHP5XWpnUcbmrasZ9uenFvzWD3Ho36nxtHwC75iojQ8pQQc/0jRNx+HWs72fL0wIP46/dKh6wW2BS6k7ETydqWqOy/6VYRs/Hn1Vpw1n8I1MDf6GyaOdUyjUIQkWUhaFLOcfUvb5H9AXOt1dqT5DZA2n33AMMLe3mx3rfQt5vFGa/xvQZeyWru4Uv5ElPbg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR06MB0602; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0602; 20:dLvYAA6XBK6FIumEHR7BsmH9wyoZVybVwXuZxQ+ukEJyG8Rewleu7XhHDWkqpAPKXVUeK6dt7UuRiEnLliMsy2g6qIVAYoCsxLiRyIdIBJanaFE76/QdDUdNj+hhG/oLU/SUwMlBlIPOZYMwAyD50Hn/XvriZ3419Hsmx1Qh+SR2Zwx3FS30IolnRbetQrS+7N69ECY2y9vYoLEH2H0Gg0OU+LltD98ru7vAd0mtHd+3r9xG+AosceEs3g9YAxQ4L5KjP4M7KcHbTIARrWX21yErbl/6+sU4JQqSc91uEMuDoF62QiZWsdfDAz6+zvOG9JGFu4A2a7WlKRHIhP9R08cOhGgE/jZ8kA/1CZRF17hfEMXHfPOcmnLbbe/6BkkyVBdffWSPOuKA6oJ1GxOW8RG652fQj7H+zCMn0XA5zXaZU4ePNVpwqlpAj530xdegLK5xTczK81wX8cAJUKH1WZfUcHKqSd2EELw4qp8oj8xBMlizfZC3fIcBvUM/OW1k; 4:bOdd1xvxHXUxjKzYOLzT88nnQHXaW/FmYbU/1nkYocZmgqw4nCdJImEf+uTOOzmDZZHvpYm6duynA2XNdRJK897wokR6P+meSRPEppRnYuU/rdIwDXb31Z5LWVHoLYP7sH81B5Il8arFb9Oa/F9nKnue83pvCUAipg+c2vMvsx7dULnRfJhKi6HPKF7eeCZuabMGH1WxpXWfEWb0R/+wcXG3f8gd61gYJinqNFcAVuteZXR374Ccw/hRth14hs7f91r4eBzTRo7wnGd9q+VAlO5vIMNMi7nzj6x32lYZ81U/QqSCB69rC0qIBiuA9grD X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(8121501046)(5005006)(3002001); SRVR:SG2PR06MB0602; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB0602; X-Forefront-PRVS: 0688BF9B46 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(199003)(189002)(4001540100001)(189998001)(106356001)(50986999)(50466002)(5001830100001)(101416001)(42186005)(229853001)(53416004)(76176999)(97736004)(5001960100002)(54356999)(105586002)(5001860100001)(77156002)(81156007)(23726002)(83506001)(69596002)(36756003)(77096005)(68736005)(66066001)(86362001)(47776003)(87976001)(19580405001)(64706001)(19580395003)(46406003)(5007970100001)(5004730100002)(5001770100001)(46102003)(62966003)(92566002)(4001350100001)(122386002)(33646002)(2950100001)(40100003)(21314002); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB0602; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR06MB0602; 23:Pmijxn9tYzrF2ZbTzIGcgASV6uUly9LH4q3mdpQe/?= =?us-ascii?Q?/kmdCNJOA0YFWimvZeKI6vcSm8fDbUC+p/TpOO07JIx9Dyn0Q2X8uFX20JsI?= =?us-ascii?Q?OwCTP0Yt+Pu5J9CJWDG5qOqfuQfh5gnkjzFx7v82GKc2C77KwozT46tw0Kp1?= =?us-ascii?Q?7T+cjW/gexH5vzzGx2ZlBblaPy4JUAd+iKncgBi6G0jHXcPGFOvz9ul85Djb?= =?us-ascii?Q?axFR2X7SzT5qH/3P6zuuIn3OFGI0fwWCByKTC5K/HbiwAAud7n0iAAQpFtOQ?= =?us-ascii?Q?KuMSt8km6TX3oMB07jH4NO57dYhbe9ZnMhpRaoET6dAjExydk5vjUrTM2AIS?= =?us-ascii?Q?/cB737vvD01sQjDvkO7PfdLcgWmQ12/oq+y/r25ZfkBHiT6yF3tc38iU4CRj?= =?us-ascii?Q?AUwTr3wM7o8oWzvQi7cJESuxy+GTosriCFrww2nbC/4YonmgF1z1+wHh6KCg?= =?us-ascii?Q?TTSiFymuBuAwR1YXYMEppDQoPUK17fed1U8LZ4FxJZUkMvZbkxMhwojk5TTA?= =?us-ascii?Q?w1EJbEDuCxl2V7hPA2R5n+PpZXjIm+Hlnf5Kx5GsCn/AWnLSFFt3NmAVm7Ze?= =?us-ascii?Q?lgBKm8aRM8uc/SfXI0s1/i3KGvruJJHfQyNT0qFFb3y4bBBxrgIBhlGm3x4w?= =?us-ascii?Q?Yo87yVV4YtmDFYqAIz4B3igyHaUXF+GCDXJ1SWExnSdxA+3QnCWpsFR3fqS+?= =?us-ascii?Q?yTYNqyE1m6E+weSzbtbS58enBsF8TqiL+skNdikArzQxM5NjOLXCMKlkMfSa?= =?us-ascii?Q?imoOc4zxFDYMGlufdHYt203dA1rLy1j9EnyX/5bcxlkHHd4i368mNYBxvUpW?= =?us-ascii?Q?AP2yAKfM6Rn4qboftMCtG4/g2N0x+uC9PA8gM46aBvIuEbYgnt5Zzw3BmV3b?= =?us-ascii?Q?9qiYhozuMrYNXhxMaW68A9zQsOkE3Y0jjW7jzkPPpqBAaqHg6Lp1LnSaRX2W?= =?us-ascii?Q?W68xSKMpVgpv1R07QE6ZOclcukT7tA2jVhVH1WTj145p5aePmxhAVRBCPisX?= =?us-ascii?Q?E1U5G3BdGAZmIVEEBFaNzeVa7inVF1/ENOXmVXuRx7SHqXOtXmMWqzJ8887n?= =?us-ascii?Q?OPtqm1Lfkviw9IcOQ/wuhMp0y2lozB23vrzLVr9gi3VRS5zWMSwi9wfRRBef?= =?us-ascii?Q?D6ZDHtPmD6tdNIiHXtxj6Yq4dud0Vqj9Sh4i1ts7oUTJiZ6eM71p/A7zCRRg?= =?us-ascii?Q?uomlHaWPPE34u/WDMhdF4bGDX8kLtJpQ1nZsCy18zL0hsFNAeoa4E8VA1Sr6?= =?us-ascii?Q?OK5lYBHPcEcQiZ10HTUdlHI2DibQZ9Kb6gEGemj?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0602; 5:ltNUZyzEzWZW0WUlQgfJWJHYGdi/T5sBRYcqvqS6EQ30vCREYaE8MmmEapmrYmQUn6yp7vq7yCoqhO1hltuXIcfdCrTPBvzdiMGR1PJ/bgw9F6JZcvRjEc30ZSrrv2xKY2WFLdtZLfbASrzPCt42eg==; 24:qdKGz7zF1eSYDEq6r19gkrs3b1cawHR4+oPAXIOyE6h/Hz0Qdhlz83OmfxP/pRSRrD97mUeHohZL7V5c9yMHTjFw3YIeFIOfl3cU63AmtL0=; 20:v92dqYvm+J6h3gFnQP4wMIUUdMrwWFq0QoMf6/asejfx/1k5uIL4jluTy/o3RsyHot0jYdQGrKcYZVVg80KTApuezcB62g7WPaMBQDxQReJ4JBv2aj7fyo81J8n3LPoKbnWCZuh6InRbuQlAzfrCmD6o8jBw38nXO6W5rLq8oMo= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2015 02:49:14.4839 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB0602 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto The difference between PINMUX_IPSR_MSEL() and PINMUX_IPSR_MODSEL_DATA() are FN_xxx order, and PINMUX_IPSR_MSEL() is used only from r8a7778. Now it r8a7778 works correctly with PINMUX_IPSR_MODSEL_DATA() order. This means we can merge PINMUX_IPSR_MSEL() and PINMUX_IPSR_MODSEL_DATA(). Current PFC driver is very difficult to read, because macro names are using different length. Especially PINMUX_IPSR_MODSEL_DATA() is well used macro PINMUX_IPSR_NOGP(ispr, ...) PINMUX_IPSR_DATA(ipsr, ...) PINMUX_IPSR_NOGM(ispr, ...) PINMUX_IPSR_NOFN(ipsr, ...) PINMUX_IPSR_MSEL(ipsr, ...) PINMUX_IPSR_MODSEL_DATA(ipsr, ...) It can be readable if we can merge PINMUX_IPSR_MSEL() and PINMUX_IPSR_MODSEL_DATA() PINMUX_IPSR_NOGP(ispr, ...) PINMUX_IPSR_DATA(ipsr, ...) PINMUX_IPSR_NOGM(ispr, ...) PINMUX_IPSR_NOFN(ipsr, ...) PINMUX_IPSR_MSEL(ipsr, ...) Signed-off-by: Kuninori Morimoto Acked-by: Simon Horman Acked-by: Laurent Pinchart Acked-by: Linus Walleij --- v1 -> v2 - tidyup log comment for checkpatch - Add Simon Acked-by - Add Laurent Acked-by drivers/pinctrl/sh-pfc/sh_pfc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h index 7cb1ed6..c8c1d49 100644 --- a/drivers/pinctrl/sh-pfc/sh_pfc.h +++ b/drivers/pinctrl/sh-pfc/sh_pfc.h @@ -179,7 +179,7 @@ struct sh_pfc_soc_info { #define PINMUX_IPSR_NOFN(ipsr, fn, ms) \ PINMUX_DATA(fn##_MARK, FN_##ipsr, FN_##ms) #define PINMUX_IPSR_MSEL(ipsr, fn, ms) \ - PINMUX_DATA(fn##_MARK, FN_##fn, FN_##ipsr, FN_##ms) + PINMUX_DATA(fn##_MARK, FN_##ms, FN_##ipsr, FN_##fn) #define PINMUX_IPSR_MODSEL_DATA(ipsr, fn, ms) \ PINMUX_DATA(fn##_MARK, FN_##ms, FN_##ipsr, FN_##fn)