From patchwork Fri Jan 19 13:11:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 10175261 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 80C6060386 for ; Fri, 19 Jan 2018 13:12:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 71A5E286AE for ; Fri, 19 Jan 2018 13:12:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 66086286A9; Fri, 19 Jan 2018 13:12:14 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 5504E287A1 for ; Fri, 19 Jan 2018 13:12:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755756AbeASNMB (ORCPT ); Fri, 19 Jan 2018 08:12:01 -0500 Received: from mail-bl2nam02on0086.outbound.protection.outlook.com ([104.47.38.86]:60160 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755439AbeASNLt (ORCPT ); Fri, 19 Jan 2018 08:11:49 -0500 Received: from MWHPR03CA0008.namprd03.prod.outlook.com (10.175.133.146) by BN3PR03MB2355.namprd03.prod.outlook.com (10.166.74.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Fri, 19 Jan 2018 13:11:47 +0000 Received: from BL2FFO11FD014.protection.gbl (2a01:111:f400:7c09::112) by MWHPR03CA0008.outlook.office365.com (2603:10b6:300:117::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.428.17 via Frontend Transport; Fri, 19 Jan 2018 13:11:47 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD014.mail.protection.outlook.com (10.173.160.222) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Fri, 19 Jan 2018 13:11:46 +0000 Received: from b29396-OptiPlex-7040.ap.freescale.net (b29396-OptiPlex-7040.ap.freescale.net [10.192.242.1]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id w0JDBGiR013190; Fri, 19 Jan 2018 06:11:42 -0700 From: Dong Aisheng To: CC: , , , , , , , , , Dong Aisheng Subject: [PATCH V3 07/10] clk: imx: make mux parent strings const Date: Fri, 19 Jan 2018 21:11:07 +0800 Message-ID: <1516367470-24340-8-git-send-email-aisheng.dong@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516367470-24340-1-git-send-email-aisheng.dong@nxp.com> References: <1516367470-24340-1-git-send-email-aisheng.dong@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131608411064783849; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(7966004)(39860400002)(346002)(396003)(39380400002)(376002)(2980300002)(1109001)(1110001)(339900001)(54534003)(199004)(189003)(97736004)(104016004)(48376002)(47776003)(85426001)(26005)(54906003)(305945005)(59450400001)(7416002)(356003)(86362001)(16586007)(8656006)(51416003)(508600001)(4326008)(2950100002)(53936002)(81156014)(36756003)(6666003)(76176011)(2906002)(5660300001)(2351001)(68736007)(8676002)(8936002)(50466002)(106466001)(6916009)(50226002)(105606002)(77096007)(81166006)(316002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR03MB2355; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD014; 1:rSRSurY/SEgYRAF/PZ1IBq8lJEa/u5jnLsMBOa3dhbACwN0lUiPKsmsYIMTjHJezwOH9/7GnnCxbhCUIWqeWcly0YImtsqaAsku7h428q8gb6FhdCfE0+QDBnVO/4iPj MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dc3d50e4-f60d-4456-53e9-08d55f3e316f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(5600026)(4604075)(2017052603307); SRVR:BN3PR03MB2355; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2355; 3:D7W5Z7f3om/FlBMU/79CSr96iZ3cASsR5crIaMU+NrH2yhsShGGvfbUqDwWgKsxBmRS3Shr+OUdKcKDfVKRUQRWWAkiDfUwgEWFC2r/4Y4FMDUmNHrk74ROOYcbNW/XddE7O02jMwewhS2cU7/Mm4AjYRBaiJgv/6XJ1g9SDSNzBHof3IkjD4E6Cjr9fR0wYAcl+rQVfVTo9bup3fhhl9aR5hf80GvCJVlPoPlsoRXiX71jkc4DfTlggAR/W/qYWFgjXrv4Blw62Tt8X1LtODxO+O/XjcbAfUk9eiDk0lD4EQnfUeV9L1ETTMNxWAx4RNlpJMmvF22ZQh/719zgOfA0K4ZSuU1YuIJvqZrP7Kwk=; 25:uRCt//rTqx2yPyjbbuXn8+J8us+i3dFrYdP1S0dAjHRIGZbgWcPf6AgKJzthpcoXOpX2hDYeYZ30LIsuJrrh3ebGPgLNVzCJ92IVCXmVH3KfZdkwOqRVVEakjDKNkrThttYfvSTdKvIJH8fdwYN1qhV75j0fz3wCkapaIn/v+zVhHHqJ78ENSJotnCd+2R+bpvtKuVQy+jg0CY5xp75dog0NbfIW7UZVKyE1YHMDtMRGDcDVEkCWoF7wroGpRqWv8znf+mVkWxgViSXB3/J/Hx8OA38exyobS5Q8/e3sZeg47wB13tFJaBArFvRPkQwEqQ0eTGV6TB3zgkRI2i0SUg== X-MS-TrafficTypeDiagnostic: BN3PR03MB2355: X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2355; 31:84VQ/dZHs1XA8BR7YPLlrJrVSWT2pLah1Y/vpwhIMhDH72zR5nFYscG2vEPm4Z1dDf2hE9DUnV8YXVJ9py1GAwpilAji4wXVZFKqng+iLeWMi7rMROlDiWzL67geEl/I495HYSdvJbGrsxxEQI8QZD3memJF6y4by3TTpFPqAhWmgWTej0o1Xsps5fEOLegVScNIEt+A9YxFkG9j3YReSJxFdQRS9viS5kRaqP41YIs=; 4:Ire/XoUB1ctMm8doNzS1sxFvu7OcrG/ktNV0zlxCgbrY1dIOytZ5/JHghTxegOjohsBrfg4LjzZ7ovhuxAjMM4vwEBuFDfj7q2MnB8WVH4fzqjmw73QZe8yBYSv4rxU6g1gDSwfgHtojlZe9l7MsTqcIHvVXUXlhakKOXh9CFB/ktoLLhI1ilCld2Yi1P0J3y2phgbWYyB6B8tMPG7X4xzVjjTmvw4h5URx4/shPPtPDOSGt9M8v3lq9z5ez+nCnTgVX3DetFIDcMmhCwPnM8xTrGn4VyURwafuNttHH09bzIMSYucddCJhnb1aLnZTE X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(8121501046)(5005006)(10201501046)(3231023)(2400077)(944501161)(3002001)(93006095)(93001095)(6055026)(6096035)(20161123556025)(20161123563025)(20161123561025)(20161123565025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(20161123559100)(201708071742011); SRVR:BN3PR03MB2355; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:BN3PR03MB2355; X-Forefront-PRVS: 0557CBAD84 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR03MB2355; 23:C1Xzvt4V02hiCACpyRo2Ufluyr9cPkTfF54cfLD0c?= =?us-ascii?Q?nntgHEZKBwD3QjbAt0nuTyxwI4Z+c5Gv66Y2Yjy/5SwmtlmIsp92vIVirFxl?= =?us-ascii?Q?qWiQJswaLisI8MWhpm1vpSI2ZZFBYPsd9A9ECaK+cXrOsiiUjxo8Mdyv5qUZ?= =?us-ascii?Q?BN8pRJdYsfvmRPyp2aIyjtrJOjVD/52ikPFUWj40+IAUxy1IKwqIcGRNtVgw?= =?us-ascii?Q?bV9cIIP1DzbL0HQXsavWz/G+b3K2L8jSUcB13n3xyO/a6x6bItSBDilhQZ2l?= =?us-ascii?Q?UZZxLuaZMvgMx24WmoAKpoZZ83ByH3MyqoObO2r/ZG05zTr/WNNNpfqImVRN?= =?us-ascii?Q?wVb9CdT2CPclqQQEsCM/8+9oT8NXOjjkTT0H+eB9W9pHNucXkkTKtoUYxTd4?= =?us-ascii?Q?wCa78WPvWv8kP1OXoWgPIvUtEkZNFqK9J3kKZ5hNmu60rl3ahmlU9+iS1wSz?= =?us-ascii?Q?3SbtPHM9itwW451Ut4mtz8JAfc3Q0AcADyORN5B4646R1M3Ftla6wwcSknXm?= =?us-ascii?Q?xzeY8wExA9vfpMWQ++mU3zQl9CdEa6fQJA5pVnuWs9WOao8ieyDIbrWbXjFB?= =?us-ascii?Q?+/6xfCl3Lxbf4Eoab9Li5WOaNBfmHbuAXFtX1/PJYUYhQRroog2nFuThtKDK?= =?us-ascii?Q?82RdxutGYbJuS5eUSU6EHAH2f2uVKD9Abd2O6lRR1veTL3nal8vX2f44XxgR?= =?us-ascii?Q?qqd2Dx/cmT4WmAoElZ1WK7PLO8MfJNSt9IXz1vf5BHcPO0wQteggNrHCroMN?= =?us-ascii?Q?DwrPzaaVJY6P0gp/G9t5kIFxiGalo++pd2eGQgTTCewoHQD+UvoxHOABsASW?= =?us-ascii?Q?c8nTYnRBG76oNnhv87hoy7GxuoMSo9kJ9Q3mvhHDSIjp3udv1xGl4/mUqwdE?= =?us-ascii?Q?JzfxCkXtRSxdQz4Ib09Aaxc10Aax14/hUIDMfD5dmmhfoZ2I8yZjSnr6UIjs?= =?us-ascii?Q?07NP5WdVfWFxe4ziakjbEAmfMXHR83LLEqwreBXxhpj0r17X9ZHgFem1hYQ9?= =?us-ascii?Q?JIE9O72t9G/wvzIvLmOTfpBnr12Uho2LTjjnq3BVDEX0SDOjZVAWAYMD+PHl?= =?us-ascii?Q?aqbOQaLaRrDLRzrwOGl5qb1Y87R4e2Ml+WfVr+cZBZBua6Q54gTnGB/kabIm?= =?us-ascii?Q?8xMzlJofbHTopf1cKeoUhZ+UkEMKx6emgq884ndj3KOFexh5EAZWQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2355; 6:vsE9dt9RNe3KtTregq/UJD8SpofA45CB47K2sbuIFdt/SL53lKensv7u7qDZIdD/qY+CjqmD3r+QnvZR3PjianRapHZDLFkkWgMfpD7MUbgMjIV6GO0U+HFNsmQXYSs8X71uLSrBOv6dMl+3LH9fstaRyOe5VoeEnTha5XECyAz4fV0k1Qdhf6DMGseVayC9weekfJyoStEoiGnjYODIy+g3LnpO1sHsyew8cBqhHNtkX1QITHajK8dVqL5FLCiW5cIP/uTkpprpu+RC9qQKukRGXy5AE6oqioM278lk7H/9YZxGg56F+sO/njSfwNC//BtaALdBW5PzZw9qfpEmzComOvqiYLZlARbXKAYLx3c=; 5:LxkpJkyBDbMeqtDXyr/faXsbsiSEgKj0pTXIlxqOvvpOugarQvGRM+VHNAQxArSOE3W9hHxCEeui8DZSEzG43H+ulYRI9w9vHArLTEziYDn33xHH3N9pUwpPXf9dIWPROXxQeoH3yIc8LL/6qDC676BCTUP88k/2vspjV1znkwc=; 24:wBuLJZeVnY49P3amgMH5CSPS5PECkvtRaB+MArOusxqOw5FA1oF5AtEFo1foBXDI6/lLFvweh/KYZQDx0hDMcF7r+poCNeKK3VClgwk00Cg=; 7:BBKGlf3q6oiRRl3aVDGKgfYEVJYYI5W00rF4yYf2Uj+NUGII6D7kSI5NTev+bFS+JdpWQ21G6JMyinYCnpxxBCzjSR3Q+98ply72zEVhubgP+X90v0GIcS5ImIlkNJNrG6k4Ok0Rbz6cUAOjI6JomS3gZB8i2/BOtQ/9DiUCTpKYeqEhEys3oV21pB8aFgOTO8dclXIjfX2Lm7OKKlvlTmXlmuoLJnmyNOfkb4VsUYWX2AzJS4E4aHQMo3TWXbCm SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2018 13:11:46.2599 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dc3d50e4-f60d-4456-53e9-08d55f3e316f X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB2355 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As the commit 2893c379461a ("clk: make strings in parent name arrays const"), let's make the parent strings const, otherwise we may meet the following warning when compiling: drivers/clk/imx/clk-imx7ulp.c: In function 'imx7ulp_clocks_init': drivers/clk/imx/clk-imx7ulp.c:73:35: warning: passing argument 5 of 'imx_clk_mux_flags' discards 'const' qualifier from pointer target type clks[IMX7ULP_CLK_APLL_PRE_SEL] = imx_clk_mux_flags("apll_pre_sel", base + 0x508, 0, 1, pll_pre_sels, ARRAY_SIZE(pll_pre_sels), CLK_SET_PARENT_GATE); ^ In file included from drivers/clk/imx/clk-imx7ulp.c:23:0: drivers/clk/imx/clk.h:200:27: note: expected 'const char **' but argument is of type 'const char * const*' ... Cc: Stephen Boyd Cc: Michael Turquette Cc: Shawn Guo Signed-off-by: Dong Aisheng --- ChangeLog: v1->v3: no changes --- drivers/clk/imx/clk-busy.c | 2 +- drivers/clk/imx/clk-fixup-mux.c | 2 +- drivers/clk/imx/clk.h | 18 +++++++++++------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/clk/imx/clk-busy.c b/drivers/clk/imx/clk-busy.c index 6df3389..ba1541f 100644 --- a/drivers/clk/imx/clk-busy.c +++ b/drivers/clk/imx/clk-busy.c @@ -154,7 +154,7 @@ static const struct clk_ops clk_busy_mux_ops = { struct clk *imx_clk_busy_mux(const char *name, void __iomem *reg, u8 shift, u8 width, void __iomem *busy_reg, u8 busy_shift, - const char **parent_names, int num_parents) + const char * const *parent_names, int num_parents) { struct clk_busy_mux *busy; struct clk *clk; diff --git a/drivers/clk/imx/clk-fixup-mux.c b/drivers/clk/imx/clk-fixup-mux.c index c9b327e..44817c1 100644 --- a/drivers/clk/imx/clk-fixup-mux.c +++ b/drivers/clk/imx/clk-fixup-mux.c @@ -70,7 +70,7 @@ static const struct clk_ops clk_fixup_mux_ops = { }; struct clk *imx_clk_fixup_mux(const char *name, void __iomem *reg, - u8 shift, u8 width, const char **parents, + u8 shift, u8 width, const char * const *parents, int num_parents, void (*fixup)(u32 *val)) { struct clk_fixup_mux *fixup_mux; diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h index fed7660..956155c 100644 --- a/drivers/clk/imx/clk.h +++ b/drivers/clk/imx/clk.h @@ -69,7 +69,7 @@ struct clk *imx_clk_busy_divider(const char *name, const char *parent_name, struct clk *imx_clk_busy_mux(const char *name, void __iomem *reg, u8 shift, u8 width, void __iomem *busy_reg, u8 busy_shift, - const char **parent_names, int num_parents); + const char * const *parent_names, int num_parents); struct clk_hw *imx_clk_composite(const char *name, const char * const *parent_names, @@ -82,7 +82,7 @@ struct clk *imx_clk_fixup_divider(const char *name, const char *parent, void (*fixup)(u32 *val)); struct clk *imx_clk_fixup_mux(const char *name, void __iomem *reg, - u8 shift, u8 width, const char **parents, + u8 shift, u8 width, const char * const *parents, int num_parents, void (*fixup)(u32 *val)); static inline struct clk *imx_clk_fixed(const char *name, int rate) @@ -91,7 +91,8 @@ static inline struct clk *imx_clk_fixed(const char *name, int rate) } static inline struct clk *imx_clk_mux_ldb(const char *name, void __iomem *reg, - u8 shift, u8 width, const char **parents, int num_parents) + u8 shift, u8 width, const char * const *parents, + int num_parents) { return clk_register_mux(NULL, name, parents, num_parents, CLK_SET_RATE_NO_REPARENT | CLK_SET_RATE_PARENT, reg, @@ -190,7 +191,8 @@ static inline struct clk *imx_clk_gate4(const char *name, const char *parent, } static inline struct clk *imx_clk_mux(const char *name, void __iomem *reg, - u8 shift, u8 width, const char **parents, int num_parents) + u8 shift, u8 width, const char * const *parents, + int num_parents) { return clk_register_mux(NULL, name, parents, num_parents, CLK_SET_RATE_NO_REPARENT, reg, shift, @@ -198,7 +200,8 @@ static inline struct clk *imx_clk_mux(const char *name, void __iomem *reg, } static inline struct clk *imx_clk_mux2(const char *name, void __iomem *reg, - u8 shift, u8 width, const char **parents, int num_parents) + u8 shift, u8 width, const char * const *parents, + int num_parents) { return clk_register_mux(NULL, name, parents, num_parents, CLK_SET_RATE_NO_REPARENT | CLK_OPS_PARENT_ENABLE, @@ -206,8 +209,9 @@ static inline struct clk *imx_clk_mux2(const char *name, void __iomem *reg, } static inline struct clk *imx_clk_mux_flags(const char *name, - void __iomem *reg, u8 shift, u8 width, const char **parents, - int num_parents, unsigned long flags) + void __iomem *reg, u8 shift, u8 width, + const char * const *parents, int num_parents, + unsigned long flags) { return clk_register_mux(NULL, name, parents, num_parents, flags | CLK_SET_RATE_NO_REPARENT, reg, shift, width, 0,