From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932692AbbFJV4R (ORCPT ); Wed, 10 Jun 2015 17:56:17 -0400 Received: from mail-bn1on0071.outbound.protection.outlook.com ([157.56.110.71]:20618 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751766AbbFJVzl (ORCPT ); Wed, 10 Jun 2015 17:55:41 -0400 Authentication-Results: spf=fail (sender IP is 66.35.236.236) smtp.mailfrom=opensource.altera.com; vger.kernel.org; dkim=none (message not signed) header.d=none; Authentication-Results: codeaurora.org; dkim=none (message not signed) header.d=none; From: To: , CC: , , , Dinh Nguyen , Maxime Ripard , =?UTF-8?q?Emilio=20L=C3=B3pez?= Subject: [PATCH 5/6] clk: sunxi: make use of of_clk_parent_fill helper function Date: Wed, 10 Jun 2015 16:49:24 -0500 Message-ID: <1433972965-24974-6-git-send-email-dinguyen@opensource.altera.com> X-Mailer: git-send-email 2.2.1 In-Reply-To: <1433972965-24974-1-git-send-email-dinguyen@opensource.altera.com> References: <1433972965-24974-1-git-send-email-dinguyen@opensource.altera.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [64.129.157.38] X-ClientProxiedBy: BN4PR15CA0015.namprd15.prod.outlook.com (25.164.54.153) To CY1PR03MB1373.namprd03.prod.outlook.com (25.163.16.27) X-Microsoft-Exchange-Diagnostics-untrusted: 1;CY1PR03MB1373;2:DKDAa5UL0n6N/L3NGRXEdj1xuRrkoCzB2jO/QjlhOnc0mSlRBZS1+yhJIEILn+Fh;2:xCpts0FS8YvGt1oh7zIUVVr4fifuIHXbZATXICA8Sv2qzUYIh5ybrpA09czH+JqnrnSL0Oe7ByLWTquKMOj1MQ0LPlYT84e5rUg4CTd+mcGhwL9h+gM+gjQ+Aks7YovPzFGFDIGozDQGH2enE3aEpw==;6:ZzoKdft45PgMSNKwgbm0OTDNnXvcJw0u9nx6xAxRrLNbnoe3UF+xTemMfrC/UQz4NzNSpJkAgOpfQEoaMD/RpoScgIXhUEXTawBb2S+mOPDtbcKPiy0sOf0+hQz7+ywFbIL3PRm5WAbYf08JzQCCMQ==;3:2abL08eecaxTAHQQR4Eh0XdvElujbFvb+Rt7ZlfhXi+Mj26PfEfOPblxPEyuQta1obdn4Oz9f1BvrXn2+Png3LOK89p5aU9ERrDJ3+Dp2awgjMaXQlw/L3HnmmNshw/rPsVU5Rj07o6ry7945hfUwR/kr2k+rX08L7/ZGHtEAr8g+VTRJ0rXhCaSMe3wVaJXwRUlTA+2xlwxrdVPwxap+2Hr7VJt47cYVI5mrYzzfG2Qmpjj1JCI64XUkBvuMa69az2dt1urZPxyC3sJ6u21QInX9VTNDdwt6k8uL4ycOBkNQd5U0QSeYjYj9nIINdYw X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1373;UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1391;UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB119; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:;UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005006)(520003)(3002001);SRVR:CY1PR03MB1373;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1373;BCL:0;PCL:0;RULEID:(601004)(5005006)(520003)(3002001);SRVR:BLUPR03MB119;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB119; X-Forefront-PRVS: 06036BD506 X-Forefront-Antispam-Report-Untrusted: SFV:NSPM;SFS:(10009020)(6009001)(62966003)(122386002)(92566002)(189998001)(86362001)(77156002)(40100003)(76176999)(46102003)(2950100001)(50226001)(77096005)(33646002)(50466002)(5001770100001)(23676002)(19580405001)(5820100001)(50986999)(47776003)(42186005)(5001960100002)(86152002)(53416004)(66066001)(19580395003);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR03MB1373;H:linux-builds1.altera.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics-untrusted: 1;CY1PR03MB1373;9:olwhXpyGCba7sBrbgCYN3MLRQ4HuXGpDX7AVc2Cvj9HsA8UXTufdcZqT2Ry9bhFkssgWDf01zxurmolaN6/YmPCoN4CsS14HDSbNUmg5vfVHq9j5CAYZBoUzv+qNogv/b2/kw9TI0qO1v0sRZvHfin+0CISMmSbH2zIEjeaKwDDbdCkXtGLJhvdV2/7Txu9igqsHpcB1vXKpsi0Rqk8sHlaRBdsJ0pBA3w0K2JopuNvRW1lWDimb0L6c1GQ7EaQ/+PLRgT3m5u3xYHp3sWGJu1PJDTmnIKQ4PnfY7Rfu5UkhPfsAf27qGW/gSTn6X8KQCN2Vut9jnIEjEEXxu134207t8JTlvQXN/H1mma4ZDFaz1Kcky/8P+L0/mGxCZk3KTO4U/kVtS02cNvB7jSP48pVWlV7vU2nL7B79NlBD/swx6/rZ/dk7Hq+8RNE8fPv9T01S8jrMB7BebmcOG3xRNQcWRqvfrbztQOWvDjw7PZUiAegAOgILZfNDEgH/PqKELof2Rds8m/zRrQBlPdAzxTCDiBM9hfj4UxzqMeFOsY31eKIKEgL7+pa9HK0E+attY2f9vuXB5lzI5DzL5tmBJYGQEkNovWJMj7QEF+ifumewOtVH5jAGM8zoiwSpl6kqaa56lT+ETy0TOLUWrnyAdhHTc7MY9x9y1sHiZb0YPyek4Ba75rpUmdXj0bvObkf/f8cH9CdejRayo9pwl9DqxS09UZ6d2+pUEAsBY/ddoBr/n9NIVWmdiHcE2TMCN40HkKezyergDJiUCp2V5jFAVw==;3:O9JqAU3h9Jf2tKayaimmOLD0i2j2hSwit7VzgwbEoAOD0LUACkPeBpoxKKTJs8BQhsvVqOWvQFBWo6Q3MNYMgBWYBTVo9ZbvfxelnUA/EakPLxachPGpto+k7l/Dn/aMqcxiGYfQvrU9sqN/HqqwAA== X-Microsoft-Exchange-Diagnostics-untrusted: 1;CY1PR03MB1373;10:wcshxn0kZt3IybIYqRgzYmTg/849fXe3H2Non3t0/P2OuoIHnVMH2Jjae48zO0UYwcZcqdSpCXW4ZYUz4k8v4cH2NgQGwL/pxnbQNoHGMv8=;6:1VO261qSwGD8XxQdLIKFQsvlEQXU24X5TS46nKR8xdhACTeqsOJM9d3ldK1RfSWQEkkYomKVsA0AXKHOVTHtKWk06Y1CR1q7DKxvnNV0aCm0aFeQ71NO+pwCKdfnt/aA9nnIA6HP3OSebkvZleNjkg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB1373 X-Microsoft-Exchange-Diagnostics-untrusted: 1;CY1PR03MB1391;2:8NddFPMvVYzg1xePQFX11DiQ4M2R8jVmgBIe3lSs1AkoogdB4BDOztXEGhbXL8MU;2:gDUyfToZsz6Ns7UlKp56gU7INcvYubl6o6PR5EjYxLB5mVDE45DlWmI7f/WyqDm4VF42D3XvhPDsE7oAf65Lb1kz2MjV6T5wnwo5Yis4GLFsTsUrCDfIFKppB1XlQ1TitpItJdHNJbRct8WylhcE4w==;9:t8D+Q+ysb6SVo4uX3SOOCBKjW/4sUCkpR8XhZo0CKZuMvooh/6wQYEspPL18EXRMNzWkytDW2TAXiCBges1PVaARW6w59LDGHWwHcYDW0/0DFo10DSIT7ENAmJ0/1GKBJccJ5yxr07aY7dVLEKFUaA== X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: BL2FFO11FD055.protection.gbl X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11FD055;1:/CITr8RnlOyUrFldy6Bkt8HCqe052t8+YDrhkxGES/apWZhmcmn3mJx/bNuoL5tKWjcdGe243dYifcXsBEZxPT4bR1jnyXhO0eByYEpLBi5YIm1iQWqvhMib6GtoKA/3cJADl+kDzwMFgLjeXjViX3ySktzanRpqOFzxooRjao38VLukv+hnIKzdhOiJdJWBVTxXjKaJl/OAHU3bUrcQotSZQIHHXb/5m0iredOphh9Kb4wMZ+5y7I8y6eu6s7vGIAmNNV2d/MtYOC5/UGA056kqQi8GcsLIEP455jVhG2gQ4+LGzTXWBuYVHrupvOEA X-Forefront-Antispam-Report: CIP:66.35.236.236;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(339900001)(199003)(189002)(5820100001)(19580405001)(53416004)(86152002)(6806004)(5001770100001)(85426001)(50226001)(92566002)(86362001)(19580395003)(23676002)(50466002)(77156002)(46102003)(62966003)(122386002)(105606002)(87936001)(40100003)(189998001)(5001960100002)(2950100001)(229853001)(33646002)(47776003)(66066001)(106466001)(76176999)(77096005)(5001920100001)(50986999)(7099028);DIR:OUT;SFP:1101;SCL:1;SRVR:BLUPR03MB119;H:sj-itexedge04.altera.priv.altera.com;FPR:;SPF:Fail;MLV:ovrnspm;A:0;MX:1;PTR:InfoDomainNonexistent;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB119;2:E6ZbLLl+YlyxPhVyVLceVTu2Iymg9hu9qXlBr2nur+wyfg4jjmUQGyqzjImqDMA3;2:yrxLT7GKTdaQv9iTEZjycLrD72wXDuhCYFBnmuMiup6lwdcLO9g3m5vxRwmQUVPt3KmhChEEXuc0znciNzrRIaHcMKv2h4RAx2rMYZzZFoPpw2uYrn5CqfqyB+yyBxCxglwgI6wmK3uD7ti4QHKzuSu3uvIUvtBkeBxHy3BPJHlOBr94hw0wTPlWyxfFviAAx14Cb4A7UnZCow0BjFDJq0GyzQxKmhIpbbIJSAjuVVU=;6:UJXR4CDbw3Sf8+6oRG3nYju4zTg/hUknPBKPS953EW5zUtnPguoHXEnlXUPa9YSx1hPuMRyPjUkthhJZSDousAzWluURbe0k1Qd1PqTryETr1bdZhDei8buU0WW/6HgU/mfhm4VYEHBBaDclM35eig==;3:FUKjTjnnU0KSU/JdemVe5AgRine5+RX5m2YCBQD2s0ZzqBAJsAVfgWxqd4HmAMsd0qz5YAmg0SkxicDPsOkGhKO5c2/tprdHoKbD7CWHOa10GZwvYFZhP8uZZ8APetIzJV3YYHOkVgqsSm76eBSjF72iHGx7/pHVZzQA0OawIPl09NkbjDMaOHFeKf4HtcrMrjxeMXP3scZH9WAfKvOD5/g+Egs0EAU5FkcxqWusA+xhfjIDrRXlPjrkQ5oR3WUar/nRiE2YtgenaAZTWPpN7YfqyR386i3DzHrzPN6qBBbjrnFo8Pm7G9DTREHuCGIs X-Forefront-PRVS: 06036BD506 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTFVQUjAzTUIxMTk7OTovcnlSV2poY1ZHY0s1WGZ5cGRvRmhaNjErdU5n?= =?utf-8?B?U0J6YnNPRStZMlFxTFB2TjhsdWZlWFlPV1BEcEpUU0d4OWpJT0FIQjdxNG4z?= =?utf-8?B?bjVRYnM4NklHbmIyazlPUm1CRC8rMHg2VURXS2NTZEthMEM1L1JFcmloZDJr?= =?utf-8?B?dThidlJjdnZOd0JTZGM4bVV1V3NQckZPNCtwU2k3Znh0K0RqSlJ0enEwZjhP?= =?utf-8?B?dlFzb2FqZTZRdXI4QThKYnVpS2dJcHJuVk55MFY1RFN2VUxsY2xXcGpFai9Y?= =?utf-8?B?bm5iNHVRK1h2OXhPL0N6UWlCbzJjVTZDSXlvMzhZQ1VOZWRFT0lRMHdUTUEw?= =?utf-8?B?TGdERmdiSTdONjFKRXVuMHZuQzlpbDViVkoxTzdoWXczT1BjM1RITVJldnNu?= =?utf-8?B?M2ZxRXlDdTZ4RWVlTTlzdTR5VmZjOGhUcmw1L21PTGh4K3UyaVZMcjJrZDB3?= =?utf-8?B?N1ZxNWpNeGV6aVNObVVvZmdOQzZDZDlNTUVWM1dpc0FJN0sxeVVqakg5WlNj?= =?utf-8?B?TU9tL3YrU1djZFBjNDNscUxEWllOOHB6RzA4aVJ4eVRmaHR5aTlQNC9YM29E?= =?utf-8?B?N2hBVWJKSk5wcUQ5RG91aWl0ajFUSVMxSkRQUXdNODg1VHpDSkpuMmtJM3ZI?= =?utf-8?B?KzFUWGRSZExOWGk3MEpZd1IxMHJ0bUFOK2J3UzBPaDd3RjVUMnlaMGVmN3N1?= =?utf-8?B?RUQ1QjBBZlRlY1ZnTmxPNmV4YUNlUXJaalhqbVhMQ3M4NlRUR1RIbEEyK2Mx?= =?utf-8?B?eHo1RUJ3eWpHblZ6MUpLRzhwa3RwcDkzKzg3MytLVEdNNFhRV0xReXpKODVC?= =?utf-8?B?dzNHN2Q3WCt6dDJZWWYvUHhCQk4rNE9nMTY1TVpOa051MmpTUGh1NUxteE9H?= =?utf-8?B?QkdsOVR0WCsyTmlmVFlRdUVnVkYvaW1teW0wd0VjTnFVR3pjY0g0ZGZqajdB?= =?utf-8?B?U2VoSEVUMUNyVlhtZmw5Q1NHeUVDMTc5VVl4VENQME11U212ZVFRNGNMR2Ex?= =?utf-8?B?SUVPQVhXUkxkT25FQ2VEQXNCdURoME5RSUN3QUQxczVCSCs2RWhLdHVGaDBM?= =?utf-8?B?MGF6L0Fhdm95bUZ0M0VOYTJ1ZURDRzNyRVRCQ0ZQRkJyTUp6NmxDWnBFaTRj?= =?utf-8?B?R1lWZjhuK0lFb1ROMS85cWNZaGdVMWhzWFBxYm9qT1dmT2YyTXk1Z2todFdU?= =?utf-8?B?MUJQOVJyaW10aG1YRk1Xc0lCOFc5Y2VQa2xaOVI2M2Y2SHBwMmZNd0NqMnJG?= =?utf-8?B?YVRKTlBmZUNQUEtFbFhoUnMycVNOanhMRlkrYVo5MXlFemxyQ1RoT3Nuc1Iv?= =?utf-8?Q?LupT5AfinIxmSWRbor8JvXYHe1sVoM=3D?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB119;3:i7vT6T7m1MeBDayNlqBnFPUJZA2jxweUKf9GuI4psMHGigrqk5ExUwviNX8gjVb8wqAhbREUaxB1gLU028ydrmuyLHV/VY7r2ZrlfrdJCPpEdOOahLih737560P2tEqdMQgkFqiUE+OscrNPe98xcg==;10:4hHNpF0ZKuvk7XHO/lRDJNUX6PtZEuk1vGRvdA6jITfwsSh1BOPGHo7Pqkw6wLMy2YqBl0EiTGg8IjYqUPDC55DtqEcMy4cF1i/BL9QHScc=;6:zVhqBh3MXGcbBkEp3ioPyWyrQGdFY9qxMF5EW91Hki3jFcWV9VIlOmQKuTCsSWY/oVcOdzvtNnLi60JnsDLTt7Jk1BXnqjB/xOqfgl0X1salr7jaLKgyElBuYOWQ8+m6GYmL+VcpncHtESxQv4fmWA== X-OriginatorOrg: opensource.altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2015 21:55:37.1665 (UTC) X-MS-Exchange-CrossTenant-Id: fbd72e03-d4a5-4110-adce-614d51f2077a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fbd72e03-d4a5-4110-adce-614d51f2077a;Ip=[66.35.236.236];Helo=[sj-itexedge04.altera.priv.altera.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR03MB119 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dinh Nguyen Use of_clk_parent_fill to fill in the parent clock names' array. Signed-off-by: Dinh Nguyen Cc: Maxime Ripard Cc: "Emilio López" --- drivers/clk/sunxi/clk-a20-gmac.c | 3 +-- drivers/clk/sunxi/clk-factors.c | 4 +--- drivers/clk/sunxi/clk-sun6i-ar100.c | 3 +-- drivers/clk/sunxi/clk-sunxi.c | 10 ++-------- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/clk/sunxi/clk-a20-gmac.c b/drivers/clk/sunxi/clk-a20-gmac.c index 0dcf4f2..a432edd 100644 --- a/drivers/clk/sunxi/clk-a20-gmac.c +++ b/drivers/clk/sunxi/clk-a20-gmac.c @@ -80,8 +80,7 @@ static void __init sun7i_a20_gmac_clk_setup(struct device_node *node) goto free_mux; /* gmac clock requires exactly 2 parents */ - parents[0] = of_clk_get_parent_name(node, 0); - parents[1] = of_clk_get_parent_name(node, 1); + of_clk_parent_fill(node, parents, 2); if (!parents[0] || !parents[1]) goto free_gate; diff --git a/drivers/clk/sunxi/clk-factors.c b/drivers/clk/sunxi/clk-factors.c index 8c20190..2589457 100644 --- a/drivers/clk/sunxi/clk-factors.c +++ b/drivers/clk/sunxi/clk-factors.c @@ -174,9 +174,7 @@ struct clk *sunxi_factors_register(struct device_node *node, int i = 0; /* if we have a mux, we will have >1 parents */ - while (i < FACTORS_MAX_PARENTS && - (parents[i] = of_clk_get_parent_name(node, i)) != NULL) - i++; + i = of_clk_parent_fill(node, parents, FACTORS_MAX_PARENTS); /* * some factor clocks, such as pll5 and pll6, may have multiple diff --git a/drivers/clk/sunxi/clk-sun6i-ar100.c b/drivers/clk/sunxi/clk-sun6i-ar100.c index 63cf149..6f229ff 100644 --- a/drivers/clk/sunxi/clk-sun6i-ar100.c +++ b/drivers/clk/sunxi/clk-sun6i-ar100.c @@ -195,8 +195,7 @@ static int sun6i_a31_ar100_clk_probe(struct platform_device *pdev) if (nparents > SUN6I_AR100_MAX_PARENTS) nparents = SUN6I_AR100_MAX_PARENTS; - for (i = 0; i < nparents; i++) - parents[i] = of_clk_get_parent_name(np, i); + of_clk_parent_fill(np, parents, nparents); of_property_read_string(np, "clock-output-names", &clk_name); diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c index 7e1e2bd..ebea294 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c @@ -200,10 +200,7 @@ static void __init sun6i_ahb1_clk_setup(struct device_node *node) reg = of_io_request_and_map(node, 0, of_node_full_name(node)); /* we have a mux, we will have >1 parents */ - while (i < SUN6I_AHB1_MAX_PARENTS && - (parents[i] = of_clk_get_parent_name(node, i)) != NULL) - i++; - + of_clk_parent_fill(node, parents, SUN6I_AHB1_MAX_PARENTS); of_property_read_string(node, "clock-output-names", &clk_name); ahb1 = kzalloc(sizeof(struct sun6i_ahb1_clk), GFP_KERNEL); @@ -788,10 +785,7 @@ static void __init sunxi_mux_clk_setup(struct device_node *node, reg = of_iomap(node, 0); - while (i < SUNXI_MAX_PARENTS && - (parents[i] = of_clk_get_parent_name(node, i)) != NULL) - i++; - + of_clk_parent_fill(node, parents, SUNXI_MAX_PARENTS); of_property_read_string(node, "clock-output-names", &clk_name); clk = clk_register_mux(NULL, clk_name, parents, i, -- 2.2.1