From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932301AbbFDTTT (ORCPT ); Thu, 4 Jun 2015 15:19:19 -0400 Received: from mail-bl2on0096.outbound.protection.outlook.com ([65.55.169.96]:26400 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932260AbbFDTTO (ORCPT ); Thu, 4 Jun 2015 15:19:14 -0400 Authentication-Results: spf=fail (sender IP is 66.35.236.236) smtp.mailfrom=opensource.altera.com; linux-m68k.org; dkim=none (message not signed) header.d=none; Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=dinguyen@opensource.altera.com; From: To: , CC: , , , , Dinh Nguyen Subject: [RFC/PATCHv2 2/2] clk: socfpga: make use of of_clk_parent_fill helper function Date: Thu, 4 Jun 2015 14:12:33 -0500 Message-ID: <1433445153-25320-3-git-send-email-dinguyen@opensource.altera.com> X-Mailer: git-send-email 2.2.1 In-Reply-To: <1433445153-25320-1-git-send-email-dinguyen@opensource.altera.com> References: <1433445153-25320-1-git-send-email-dinguyen@opensource.altera.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [64.129.157.38] X-ClientProxiedBy: BY1PR0501CA0038.namprd05.prod.outlook.com (25.162.139.48) To BLUPR03MB1361.namprd03.prod.outlook.com (25.163.80.27) X-Microsoft-Exchange-Diagnostics-untrusted: 1;BLUPR03MB1361;2:g/x3VM0OCbjgELexDm9MAyja0PWmW/xSuIrY+oJCga3CdT51rLgUUIECX2Rr3brm;2:9t0Xv+K/AqJ1hlfkURtpQnXqAweUujKfqQP2Qc/weIgBm9yw/+lnrKS162Ase7qWW/xkhVGF8p9ND5/FwNZETm9loXf9C1kRFVo0uwd4aADqO0GoWW7GlwJMdC4dmmzU1pRoDuKrA8z7f9UYYECOew==;6:fWMBDH9CUnXxTRzIks74mC1IlHtBmpRqARLTvzgLktK8cy41l8V8yKcju2bgdtUXlg/4V2KD3TnpIoi6sMmBYd6XEstv2gAXPK+szBkB9oeXcdek3H3ssp6dZUth8VlUZoBaercCxQhk3gt648nIBg==;3:p1mCBsFCWfcdqcvX13H7lMPmGjHvvdvNi4JS8e7WMfcdUXuLRq8SWSOHwMiDmDnExKb9Pvy/EVj+lha2ylmUIXs3zRamRWGxZNhnIt84cnjkE1PJVpeiXneokKV+cBAa3KTA80KvlxNAMGhbz1qwTXBM6Qj+XWjMjj/4W/mnmcnR0pfIiVILqj7JfNgYVmX/rY2ULh5LQuTdiD7QXjQrTu4NTTgVwshl+oHb3sv30oL88OJwQFSqFWIco9rJ2PEjVKglS4wXLVJatmOD0hGCZcfW9ZwQ9MEBb5UmFaFe8ugGhTNPfLf8pFf2ENj5Q35O X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB1361;UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB520;UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB226; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:;UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(520003)(5005006)(3002001);SRVR:BLUPR03MB1361;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB1361;BCL:0;PCL:0;RULEID:(601004)(520003)(5005006)(3002001);SRVR:BL2PR03MB226;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB226; X-Forefront-PRVS: 0597911EE1 X-Forefront-Antispam-Report-Untrusted: SFV:NSPM;SFS:(10009020)(6009001)(189002)(199003)(48376002)(229853001)(81156007)(42186005)(87976001)(4001540100001)(47776003)(2950100001)(105586002)(69596002)(53416004)(106356001)(92566002)(86362001)(77096005)(64706001)(189998001)(50466002)(68736005)(66066001)(97736004)(5001860100001)(77156002)(19580395003)(107886002)(122386002)(5001920100001)(5001960100002)(33646002)(40100003)(76176999)(50986999)(5001770100001)(101416001)(86152002)(50226001)(46102003)(19580405001)(5001830100001)(62966003)(4001430100001);DIR:OUT;SFP:1101;SCL:1;SRVR:BLUPR03MB1361;H:linux-builds1.altera.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:0;LANG:en; X-Microsoft-Exchange-Diagnostics-untrusted: =?us-ascii?Q?1;BLUPR03MB1361;9:92HeIOXkU4XOs8doiwc1kM7UKC1TYwDKarxNpwyE9g?= =?us-ascii?Q?tU6BT6YqJNW1xy6CRTlXb7Ul40Cwg3hUTGLyBbDXUl/oUJu/KBwpglZ9RjhK?= =?us-ascii?Q?zExdD/qfyALWGRs+La1Dcz9TrzWMwuSH1Qc4gWIvDHwv0eXK2cWS1PoL9YtI?= =?us-ascii?Q?pKbtLjWPraVLI5uovGmDw7LC2eZ/4doKEByGi5oQvi8UBEei6KSXHL+cBogd?= =?us-ascii?Q?Z6aN1L0beGFXgI+wVpY66BEahkhUFgGXSlfXuHkTHOZQjJ/krGY4hBBdk4ct?= =?us-ascii?Q?4C6z2ckavSi6PfHr0Pfok8oUhvEQfphavwsqSZcU2I/qh59UW+1H6AXdqDUp?= =?us-ascii?Q?RAxMuEasuUh6yxw8X8ZcJP53+dSRAFnaUe0LQGmQ8DcPRV2Ag4a70uALvxP7?= =?us-ascii?Q?t2bj+lOYv9FFwZXCTDUBINT9oQIas1s+K82a/tyHb1HbDqpwUxfoQTbpVJUv?= =?us-ascii?Q?fmqufFAmfIzhp2wT5hTnycGUnOJANzo1//6RQflGxN4IBrDiieCClAJ3TfNL?= =?us-ascii?Q?y8IW3gzrXcoBAI+u8CBfcypx7arD6NkBchyssWy1hjQi6zYqCMhTcx5wYULj?= =?us-ascii?Q?zKKWn4Q4khy3eSdzE/sUHhBCYuT1k2VmA6tomzdN+L49eA1EzJk5fRzlguuH?= =?us-ascii?Q?0kXowyD5hjlCJ4150QskeduneggA0CyMtCoagJPcRBTf1VLEX5t42f3TaCFO?= =?us-ascii?Q?zpvjj+IMmTu5JZtEFAl56Leo387db8N3FPDXdUsx2WoG0VpJGNKN1jYUtr7L?= =?us-ascii?Q?pFLkdO+Jb3OKDd6GaaeLP8O7lJO7tQW9ARMhWWMJaPajYtOrQzU2fsJo7+tX?= =?us-ascii?Q?b7lBMwHGxpPA7hYdRfs+/jkV1JINKpxF7NELQ/HPJeBkYOUTenDFrA/t/o+0?= =?us-ascii?Q?6k/tbHifJhKIGjb0ZHtRQ65ihLaqPhQE+Xma9+j0G/RmeswqEaq95SluL2kB?= =?us-ascii?Q?7Ch6MQEEtHERR9XYcx4Ho+WUHZeSVVfMqTrEm4dE7TZ9xHqOunW8MQzmQP39?= =?us-ascii?Q?SP+oA42SxQuDxAWuovyO48S9ViJDd90f+UV0nkywQRRV2ePtcE4LtegNMzaw?= =?us-ascii?Q?lwv4gGsSO2HOvciQTAfuJco/zk+I8iVSiS0MYoOtOpGRUlHJ9us5r+Lwfyw0?= =?us-ascii?Q?dmfzlTl0ts/gup/gOZUnKPfwcXFT1nZq4CycEPggZcHfT2N1ztScGPdf9NLi?= =?us-ascii?Q?UaZdtxpwYiZz4=3D?= X-Microsoft-Exchange-Diagnostics-untrusted: 1;BLUPR03MB1361;3:X6FUGB1hJwhA8osqTVll0sVtqUPxYMdic/tMcrSbtOGmS8awCOGnJW89p05IBdtH6JV2USLevi5jCnqz92qFapANJscMjWSk40xye8yG/h59B5TG2xDQfn6rybMViyZFbeJRNvjXaQLgjKsHFdxnGw==;10:uIy6MAfIbXPhVeYai0qNciyF7DhF0LQqg7CSXDxfwnwZYEZ/Sx3k9AbzhZTerE24Ie1b+/FNldXwEEJBxVb461/WkAVPQSdEnAQH77jZOEE=;6:+vdQpdtNYFKv2FHaivBXbZhMjvWxKC9TY58OJAg24ntJ3S20Dd3ZHWTPj0oaU8VEnl4VqRjhNm10dK0kfRBQv4vXoOcuhRWYpwRLSjqA2grzr/hU4sCYipp5vZ9o5kj39LsqgY8JXjSI4yVpxp3jvA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR03MB1361 X-Microsoft-Exchange-Diagnostics-untrusted: 1;BLUPR03MB520;2:hG0t6HmUdSPaNg7r2BmNMhfVRgMU97euDd6c0nuvsTl0TsBs/Lq6Nsk6878Rof8F;2:sNFsyo/SBm4Rk7zNneaHj9RO5EzjCRxQYoAoRjfSUHqEdn6m5m+ZerSP6iAfGRN9EDeKpWoSX6NopMeNjBCSFU/IE8yKNZlUJ4uVBZfoTZu9WMZgPsNtjkZX1btGG2xGitj6rtdmp4pTYV2GncorIQ==;9:a9wyTr8RoyUfOP5Vya6MDDz8jJPQSOSaOe840lREofwlAXBR28EWEwZjz/sj9ILSp2qIeYmEQeiV/BsJu8F83aSuAlIefOOYc2RNvfp/UOAQl3Icl3CNX7AlyclwQodDIItw1/Y5NB6r2FzpMlfNeA== X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: BY2FFO11OLC006.protection.gbl X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11OLC006;1:+E+BPqljcpRMAgLBN0xMPIiCZa+Ddxi9btBV/C/cteClrpEx320AZC13+lWBr3GqsdVbllEaQ+HKuD8eCJULdscDEC9ZnUcG/4u6SSMpIwieoMSwL7+59R3NhAPEY/p1QByLjVZWJ0T3HaCouMRo+CKafhroEYn73eru+HvLFBhe5sJPuPD42RsvhQh0ut2YA7SR0bH+ZPkdzlG3mzhBmJVUe16LhkZImOP+VuuPUbHObPITrkuP+VoeqZEpCi5eCXMb8f9Q7Mnrm4GepdH+aiaFjxYBeGkNoM5GbBXeaJlMOsj7T2ibjHJCjJ0cfztZn4inxdWiZ10wIDzfyrS3DAqRwm6dpQKKl62DpL6CRwE= X-Forefront-Antispam-Report: CIP:66.35.236.236;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(339900001)(189002)(199003)(53416004)(4001540100001)(92566002)(47776003)(33646002)(229853001)(105606002)(76176999)(6070500001)(5001860100001)(5001770100001)(50986999)(81156007)(5001960100002)(107886002)(97736004)(5001830100001)(106466001)(189998001)(50226001)(46102003)(50466002)(48376002)(6806004)(122386002)(86152002)(64706001)(62966003)(68736005)(77096005)(66066001)(86362001)(77156002)(40100003)(19580395003)(85426001)(19580405001)(2950100001)(87936001)(7099028)(4001430100001);DIR:OUT;SFP:1101;SCL:1;SRVR:BL2PR03MB226;H:sj-itexedge04.altera.priv.altera.com;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:0;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB226;2:7IeufJ5q23s6UwAk24lly3LV6AbxttUyninhZLANObr+1QV0PAeX9Cm2Uzw0FpQ+;2:ssHekd+ckw77uUe9I4jk52bCO5NWWUqgmcevUGTfixT+LrBsCeWuaaRhO9wopGQKyWJrqPlzpxL+g2j9dW0uQ1rfxGoVPUErd8KrE/3oI+rW9ZCwxB57RF23EVuWSb/aotw5fNIkNuTNNjdcD+iJHaxjXzHbkaFSwTwydQwbAz7t60pMrm5c64SdFbkim5uILAnu9imrdQBsf1/tBREgv+t9PtoaHEE3ElOWKukeFYs=;6:5tq34qLhGjo1K12RszLm8Si7s0aqY5Dd4cCHM+qpingNQlVBBGm8K54epQtGMg/JTZBknk6ACYPkZRBj0Aqe7BCFQlvk71RKI+AQFgdDv3oQy8gD8nr3cOdyMQYNX9/TxU5b/I/QdMNrVhhCeeNVdQ==;3:dEUvH6oZdXuVWzTBJQZ36e0g3UeAqUm/zbOrHiC3fBhEx8H/D/DRzjXxjlYIiK6WTnNsboTnthRIkt79uixm+FvgurF+nSn7c9raWY8KP+cDBZ/2yDvjlKZh1n1eO+bZjz+EoZ0NX8gr8jTlyUkZV7nKKlZgriUIhz2o/tP08cUf82afQD3OrlnPRs13flrbUKPkDh55OzteYPZWdf/Q28o/Dbn/nf5xx7nnDikOAQq4X5eqvZbTJXsH0IyJefgpVvODNngnPUrpYV0tPcimtydD5hsQFSeaUvDf5kV5NWvGtzhQjYzDU+lVPlafLabQ X-Forefront-PRVS: 0597911EE1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BL2PR03MB226;9:46Xf+btzi9RtB6YIMX74FWmeYbsASlpjnQlwAU01nZi?= =?us-ascii?Q?2el9R8HbW49DYgGg35LxugTTnKeEYNZwzECg9KFBOxtnu5VuGqv8XiZvwXyh?= =?us-ascii?Q?GBoU1YWxssY4qUFTQAnKf3DsWq/Xrgfy8q/WjwesiJp3GmySwqmEF2V9Q/Yn?= =?us-ascii?Q?bVolpbyEAsKsVWHAArAbpgidtFSNEuTvhxW3Q55U4NfqhL2nOkNJa6mk3fGz?= =?us-ascii?Q?xQWdGy4wLuocePL4blL1LjlBZc71W01i4WdpyIBPI3PdK2Bp1t8J3Il6Gq12?= =?us-ascii?Q?S31lf9DjgW1YtyrjbaDeqFHK9ZFEhkznpGSQPeK7WS3EW2REBNcMOwXE8GRF?= =?us-ascii?Q?rLycoy6LwTKJBNbdWo3XKh+sGR3jQNEj2uY7PkjK/5/jjwX4o619Doo+YkZC?= =?us-ascii?Q?R+O51VzD1PApzOcVxeNHF+jJPQmyefsHtMktQ4/MGFNEGH2uWdSycYGxWmXd?= =?us-ascii?Q?7jzXjmVd4GEMTnjWQEZE3DjF4qMAtBNarnEmIhh5N2W4YDXs7gUmcsNMnA58?= =?us-ascii?Q?IIYXKZfQAH2UCNvrJlGnYIzPMESZNI9fcz/Tx1uzFcUSgcgla9DwWT3wrwhF?= =?us-ascii?Q?14D5Eb6OZ6MtE/rY0MwTLGp3b4njusKXkn0XcTM4SwpbNHm/Po+n7m3cpSPO?= =?us-ascii?Q?h4mOsV7YzotiBSZutOurLKngJ9jgkujsOUYR17BKLvCyvdaK4YspCTFGYXKJ?= =?us-ascii?Q?LGuxepzBJyIi3HHUN5Uc2OIxpIwTRbgAmKXYolw08iki8+GPesY8eF6FmZFK?= =?us-ascii?Q?d3UFwkRDmpjYUEY6HzaXRTcedAz2jv6CcPfp41td11m2kdWbGjncuLnV3Ycl?= =?us-ascii?Q?3+wKv6N13O1/w7DKZLnbe+f1lEk24+l3cdyJYEvMn1mrLF/x2n5TcGeI2E9w?= =?us-ascii?Q?t5kkIKu+NF5mTkA9mia96NwyA7w2J728pgpcqx3Zxzx7bXkDl1h36dZ0HnIv?= =?us-ascii?Q?sACJtBXREzsIzLlCtPcUvlzTTWZeRvLFyrDK8c14upt0VWrYfBHrUlq6Bu7c?= =?us-ascii?Q?rMEvy4duOcvPdmZ6foRbTQVjhhGsCuN/6nel2VMKTiXyWKDgGRwSGIS8V7lw?= =?us-ascii?Q?QSuFhoEPyA6xsJ1G5G17czXiZ4Ds/VaEYgL1RuZx6NbvpvrxO02/duoATkb+?= =?us-ascii?Q?J3OL8l9qUHIlgc+O2pz/k6a0kplUvlZnV7swvPRl9fDbIFCL15L4KCAHK0HM?= =?us-ascii?Q?o2X8GPjwG2tg=3D?= X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB226;3:++v4/kbphcg9eCNm+UMDnngfpGvHA0M+plYB0Ge3eYi/d1L0GubGnOkGUv+VPBcKk0Dz0/aZL9qtMeZ5hMWvHvAIqNwrpx3Sv02xZvTfYoXTg/Ux2/mL6oE+iu8fFnqGMhnVujDiG4xrnEFcvPzCgA==;10:nlRv58JDt/Kqp+QzA0WKecXtZbQL524z+kSVNFxhj+vIhxkeoLO+KyrRP/CmrfSP084gidpDPDEVvV+wv2f2SIhiFYB1GZ4XdHjN4sMZJ6U=;6:yPDKjjtvfwmRR2/THFR4EbUuJhOZ6h/O0AjsdDGybb8FTEgVQnXijy3G+B6axsaaF079fBHUkqHWaxXmtGZXkMvoWlMjAtF9ZH2LeIOpMNIWgqmBAncKbsbJzhg0GVsP0lybFF7KQBEk6HXGa92QEw== X-OriginatorOrg: opensource.altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2015 19:18:52.5416 (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: BL2PR03MB226 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's array. Signed-off-by: Dinh Nguyen --- v2: none --- drivers/clk/socfpga/clk-gate.c | 6 +----- drivers/clk/socfpga/clk-pll.c | 7 +------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c index dd3a78c..fb5a5d7 100644 --- a/drivers/clk/socfpga/clk-gate.c +++ b/drivers/clk/socfpga/clk-gate.c @@ -194,7 +194,6 @@ static void __init __socfpga_gate_init(struct device_node *node, const char *parent_name[SOCFPGA_MAX_PARENTS]; struct clk_init_data init; int rc; - int i = 0; socfpga_clk = kzalloc(sizeof(*socfpga_clk), GFP_KERNEL); if (WARN_ON(!socfpga_clk)) @@ -238,12 +237,9 @@ static void __init __socfpga_gate_init(struct device_node *node, init.name = clk_name; init.ops = ops; init.flags = 0; - while (i < SOCFPGA_MAX_PARENTS && (parent_name[i] = - of_clk_get_parent_name(node, i)) != NULL) - i++; + init.num_parents = of_clk_parent_fill(node, parent_name, SOCFPGA_MAX_PARENTS); init.parent_names = parent_name; - init.num_parents = i; socfpga_clk->hw.hw.init = &init; clk = clk_register(NULL, &socfpga_clk->hw.hw); diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c index de6da95..8f26b52 100644 --- a/drivers/clk/socfpga/clk-pll.c +++ b/drivers/clk/socfpga/clk-pll.c @@ -92,7 +92,6 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node, struct clk_init_data init; struct device_node *clkmgr_np; int rc; - int i = 0; of_property_read_u32(node, "reg", ®); @@ -111,11 +110,7 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node, init.ops = ops; init.flags = 0; - while (i < SOCFPGA_MAX_PARENTS && (parent_name[i] = - of_clk_get_parent_name(node, i)) != NULL) - i++; - - init.num_parents = i; + init.num_parents = of_clk_parent_fill(node, parent_name, SOCFPGA_MAX_PARENTS); init.parent_names = parent_name; pll_clk->hw.hw.init = &init; -- 2.2.1