From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422683AbbFEQdD (ORCPT ); Fri, 5 Jun 2015 12:33:03 -0400 Received: from mail-by2on0090.outbound.protection.outlook.com ([207.46.100.90]:6528 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752296AbbFEQcp (ORCPT ); Fri, 5 Jun 2015 12:32:45 -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 Subject: [PATCHv3 2/2] clk: socfpga: make use of of_clk_parent_fill helper function Date: Fri, 5 Jun 2015 11:26:14 -0500 Message-ID: <1433521574-31052-3-git-send-email-dinguyen@opensource.altera.com> X-Mailer: git-send-email 2.2.1 In-Reply-To: <1433521574-31052-1-git-send-email-dinguyen@opensource.altera.com> References: <1433521574-31052-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: CY1PR22CA0016.namprd22.prod.outlook.com (25.162.32.154) To BN3PR03MB1367.namprd03.prod.outlook.com (25.163.34.153) X-Microsoft-Exchange-Diagnostics-untrusted: 1;BN3PR03MB1367;2:CkM2uPHGygsZJJmoV/i6YbFZnAsYsmTaK5iKPfuo33yZdbA2pWf/bl5hjs+TOuFC;2:6HglIukklItQam1NJQevrTOZ8+12V5KCZi4/3LeELB5YKYY7owGyRExNwF1zoqsfdDv9vx+/XUAmXC36ZsOfMV5RMWU5yNE43HRwnJAUWwkm7nilyxCCCdPHVre6wGtX2opFeyMMfGxb1vWHQARanQ==;6:Jd79Dnb1ojuRhoQp98sH5I5ad4BwXcCYaZiC4N3uV/4dCwk3tdo/fVRchqZMggb/vB7p8zKTiV93vqU57JnE+gtdTUElqKDXWUqihLr29MvQN5jNCJjfcDkT2np1QlRt3TXGRRlP/8Q9AKzrG+CeHA==;3:KRFH07s4xjYa3aJrVLTE+J0nmsyAB1agjfXY8brhdlVrxRgmGyeEVeXLWtk57ZU9RRnLUQAFrX4Id/GUn536V8YWMBMebvGWJPAA50vFjxnML+5Uga+eAmQ8PYIwaOCPIdKlcnA/h93MVhK+0ei0N8DQ12DLiUwy/NZpDoe3rXhy8kkkNdKTZ1Q6wItrwlrlDc/nMZ70TUbTb1EkycNTKl3GIR1h/OzICEUOvqRAasdfm3aVnOxtokhm9q4ybnIOCRtoxdaukeHXuFAM9xNgEVGCZVsbAKKIg4TmqQ27SV9dftWPl5dhjvryYADojv+9 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR03MB1367;UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR03MB1429;UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB228; 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:BN3PR03MB1367;BCL:0;PCL:0;RULEID:;SRVR:BN3PR03MB1367;BCL:0;PCL:0;RULEID:(601004)(520003)(5005006)(3002001);SRVR:BL2PR03MB228;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB228; X-Forefront-PRVS: 05986C03E0 X-Forefront-Antispam-Report-Untrusted: SFV:NSPM;SFS:(10009020)(6009001)(86152002)(229853001)(46102003)(92566002)(48376002)(47776003)(66066001)(40100003)(122386002)(33646002)(77096005)(2950100001)(87976001)(86362001)(107886002)(5001960100002)(53416004)(189998001)(50226001)(5001770100001)(76176999)(62966003)(50466002)(42186005)(19580405001)(19580395003)(50986999)(77156002)(4001430100001);DIR:OUT;SFP:1101;SCL:1;SRVR:BN3PR03MB1367;H:linux-builds1.altera.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics-untrusted: 1;BN3PR03MB1367;9:rYLbu53NA9KYV8PG4DSGeEIw5xT6VRZZFzWv/vESaylAVi1bQ9wuANkOuxONI0WFiSvot7vkWvqAy/fHQdc1AW9YC1QXET0CnWXDCPvjqowpPvEgUJjJxdYP/cRkv1G9xFIuSmBp0l7F5THxFU5cQKAvtWPeTtUcd3yaMUuUJEggrd7w0P+rsCDtIzeC3uRWdHbIP5e7uufcsDaUZGGpzw811ef9ET3D7t8wmvWj12X69LNGthvFADsB2WAcHv2ULwooKmYrqVMCDGQY6p9+Njz+Ud9VvemNV9LenAXEqvV0pI9/xlTui2k8lGyQP57AK2/weuDndAl2ZKQ4XYpF+xCY+4pXl7FxI+4bxFT1qndj3rnAm0ir69zC3UH5okjv8gbX0G8jLLdW4vR50Rtg4wl602cCRJqcAxG+p4CcHReaUIMRJIT32IprDpAcuVfI5VpYJcJLW6ol+rSFmfnn5CfekLYX3orV0w8Gf9cFXuxcdz3qKlwfVY2/mkMRzbpDxJJ/ZC3uxM2fMEKu0aRFiTmeBW8gAjb6nZIEpSK9mVvB+CLD+iCR6YgsR9MDXLGlMHTueSQLVgUyCuT6bSjfjrAz9md4vvv/7+F/yDBojc5dmSl94zhPmol4rvFd4aYRQAUEW7PSVAHROP4ZzE0ccwA+2L23yS4KNVizrOVmqDklJqoNnnySvnGvxKXTdJ0FiyT77GBOXDwY+lYGaL0phFc+R06yESjm61jK1FX7NpONlbilY1Xm/GINMf+7YJONm1VWebcX6FVk6x0gU5QYWjjTSbwbc9O13aZVxvJT16rSrCueF/CqEW9RsB1rS69HLXIjN81IUHkjM0I5ft9YdA== X-Microsoft-Exchange-Diagnostics-untrusted: 1;BN3PR03MB1367;3:DCqp4IgMtmSZtgR4Ir8Ukon3ABL+ppZt5+4CJ9UnGa7p33FN/qRx+Amjy1Ql5yAZID1JkSYuDPfmBK2gnGB6lCBnasPPdQolykFjdx3ek3xsZEwm25IZUGA06rZAyV1IgpawLlos7yCtFYmSI2yOWQ==;10:9veeNqxYvNvGFw9JM4X2dnygw66PAKyCJv58W2OrUW6BLbWYdhxuNMLtCRKKhJE0VlZkVgjRL4xsI03pnR6R5LwqniiGuutdZTQP6zdRaL4=;6:igRr7XQwjsSCY4SeVGtHv8Iq38UTVoeejeaKg6eQOylh7sIVKXlwr0iTQpLwFqLraOtEdJJDkj/CRfOGfHPZ/eaF6QvcRL8Hx3+dm9ZGNfp0CiSIvS/FrWDPMQvHC4rOeM3bdefweo8n2qtAZQG9YQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB1367 X-Microsoft-Exchange-Diagnostics-untrusted: 1;BN3PR03MB1429;2:IS7+hehoy/c2SnfQC8/2mCuctZlJHEVlXQEZZGRGI0DX4DB0jjNJ7EQbb+v93HVa;2:IbhYk2nqGPfveKLXmCOw5JCk4FIbv7y1idMwb7mePH80+rY6cj5o1vBthwbp8+i4DMjV13rKDzt6gbgMvlMvudY0B6p7Q3LEsVh9dInnz/GXyXa9AHGhH+xrlXw1ZaSfh++57CCw3/nXCoh1gEgSMQ==;9:34CQwIuQ+5ZtA77TlYj/jioM/ZTYpDF6pVEaFBteEX91qrpaUwaxbCKVr2/LbOpOS2B/vFyl7mMsyV1OlmdPzUnYJeIf+dHbL4JFf3yAIcvVx1qRR44yVzCyo75yN7kIGvlFTYsLC1FtbvQldf9mQQ== X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: BY2FFO11FD018.protection.gbl X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD018;1:vrEDyc7s0jVXWqeYEieycO8WG0myE4UrdKzJP4GQLoEBSpvJpa3Fu7+omy4/6WxRTYR8xis9T1JJfKtD81oF6WdBAA96YHOFqEpUQjU0G2SCnRUu72ZjimgQPVsh8UXUi3XyIUBEUjQgL16MZCF0nt5g2WGckydqAoW4+6xND2Orj+JtymV2XeYeBrRq1PuoxcoQ6V+DHMY7gt8/ORdupXmhSpxz03iuTkiFFocxmwihwxfQomdEC+gUsvMtbQ9Nsy26lkPvfUSwwbNlc5vQQyXMQYeHswZQs6wGvPU1j4uZsV/2KJ9XeZXo1tMAASZVoKBAxxJCR5EfQOLoBWzxog== X-Forefront-Antispam-Report: CIP:66.35.236.236;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(339900001)(189002)(199003)(92566002)(106466001)(19580395003)(122386002)(229853001)(189998001)(62966003)(86152002)(86362001)(2950100001)(19580405001)(5001960100002)(85426001)(40100003)(48376002)(33646002)(50466002)(77096005)(6806004)(46102003)(50986999)(107886002)(76176999)(50226001)(66066001)(47776003)(5001770100001)(53416004)(87936001)(77156002)(105606002)(7099028)(4001430100001);DIR:OUT;SFP:1101;SCL:1;SRVR:BL2PR03MB228;H:sj-itexedge04.altera.priv.altera.com;FPR:;SPF:Fail;MLV:ovrnspm;MX:1;A:0;PTR:InfoDomainNonexistent;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB228;2:RPSQnqB9X3UTZvAja13ZSbg9pcvkNRdLBjKPnHFuKhFoQULQdFEg+JrmRF9uslxA;2:Dd/wgaLQPK6Uio2zfJ28GkoM4w+PM4COeSepQNDEW07d4AgakCvGmvnN916p3S+3FggTbMPWyZ0pzo87A9prIyQwxM+0aU64NEUrf+VR/lv6Md9tap2h7CpAHFF5sQRxYLxF7IEYsvAhy3gPLaKf3qVYHfwh/JIY/ik4TRZVhrFIoAkLn4DnY+ad3g0/nuFvgd78rmleMT4eRu+7K2HGtH1VbEZ42swTsi8m+80XI/A=;6:IDGLdLN8Y6mKi60vHqNUqcjRBcB9is0J3hgX9KI5KRbFsZkMNzAuw2SgBOdvvcOigUIcE75BLDFulybZztvhcq1tkQk3Y2Qz2SFPWTjG74HB66zk+TIittV/mJAX6ZWS1t9s7brp33xzVMBUSpBrtQ==;3:eRZduttRJ5i9OzydcrHuXuYjaOzo7A3cPr7qMyjotzxMN3ZBYveioWW1+26TaikS256cVqG+YpOSA53dqegkAgxNuLIuVySFB+5E5KO4awv6seVnCafJqXtitdScoGLdxY1+OpZjmMmyAU7bJcYfqzbPHHrnRQVdJZ9CHVEpCbTrYiooCIeuuC9QiF3iGNqml5Gpu8/ba0hSOMLAf90sllok+I1BPmRz309CIZLCrpI56h/fPCT3b5pHyPm2I/+JSiW5Avm37icrmUv0qSVeg8dOx43YwBI3+EPd80SH/vEqOAKVRAYvag6SMPtVISNS X-Forefront-PRVS: 05986C03E0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BL2PR03MB228;9:jpSw211ZfUSO7KUaW/4xVCj5OmxNTK999KatBnuT2FT?= =?us-ascii?Q?kaMTQ1aX7UQap7EQFWknbmG+igd9l5Vuyo11R1zrCKSH0SaR6q69l88fiiuQ?= =?us-ascii?Q?rHdU2Zpi0+t1Dy93Ws/q7QrMGxeE/Ci6tWNiUIjRj/mkG9a4esrnaQE2Eyms?= =?us-ascii?Q?4VgOseWrlZBtgc4T2BNKu0bU5Z/0t+3tX/udMVjwsoos1LAyJukLkSUUtoDR?= =?us-ascii?Q?jFmtWjFMDX9WH9BTed3Wqnj5mhPyGj/B3KVPtm5pbtg92f6H+ZLrYlr3qaqq?= =?us-ascii?Q?/IdENt/NmxsLDAI5q3pMgULFvCN16KaPIXigN7HWlaJ8ev6wDLsLRBen6ccV?= =?us-ascii?Q?kMMxMz/YLnwPEInHU44yUrPCU2ZOIC2CRAq6jR+xWere0KlEh4N6oJvAAo1W?= =?us-ascii?Q?l8bOtWYn1+T9wjPdXc59o3zWhYekTm2hljBtmteA0LvcXwJg3D2rnQEkozP9?= =?us-ascii?Q?oEnCTnEr9nmx0CHr6E8AN5SD6R8OWu/+rblBpOD3kwYJzVrBl0e4ldCMSflN?= =?us-ascii?Q?Gx5QgCQRO7XCKxQqG/2Al64yZbpIPJx7LW+WWv4jfSyQvwDEGTuDpGd3rijm?= =?us-ascii?Q?qBOjiV3U1o5Uj1v1iorAMp2vS6XQXaMrHxhFIaILP6wj/WUIAo3mtabBB+Q+?= =?us-ascii?Q?gri0LOPYDWiz0YVWtZ/BEsKxJbIPg4w73gCqwkv3Emj9c64XU9Fxw1F3S6Ig?= =?us-ascii?Q?WAV0dkS6kB5HDaBc0ygv6XwulRolvU1N6OB3r3RY0dnPPox/AVAtelLKcKiO?= =?us-ascii?Q?pPyXnpcvsTllQ34I00lwvfw+ctg3XvR0gnAik3JrhecFVZH+81ZBS22U4Fmk?= =?us-ascii?Q?1UqdSYwrP2Ylhpf3/P13v1xwrNp31p2Mdj4A0ArM83hKfLfwETA1rdGpzATu?= =?us-ascii?Q?0AV1556COeT6zPRPajrFnG4zsfZH3tLDCyyGkPLabHxJH+AleDPbhBda65tG?= =?us-ascii?Q?953Rxn8dbjpTfziTljN+26HDOBEpQgDUAsNyrwFVErJKmA/VcYCHIKROwU/M?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB228;3:VksIYT9aWzmoDAtZhqa33Dupy1psiJC7dqGGjbCHYKn0mw5Haii0O4+L9IwNPKZ8LFl6o72+CfBLXwXpgYcBK5TUvGS08kWjHx0cMHfmuUCKjlVeGRcGEL9byXU/NUWfK0PXngLlzSgryNXYa7+AOQ==;10:UfbAkiQmS94yYxjPcnnAGJY42fx04W8PYtO499+/c7iCS+XIaHV9jznyGcCn13Fs/uIf2YRKSf/KK7Asb6vxJRIlXugriHTdnrHrZsR+bqg=;6:y87jwqerlat+yu1nxm0ZALWTNeyEeKQ+ziJ79THUAYy1jbNF3DcsJN+e37lJTKcZRhC6X8laCLz2YGj9LckBzpNwc46fC0oq148zI7keLeEg6F6dNNc4HwXQoUNCD7V+n/BmXOFA5Zp+QM1VbWqG3Q== X-OriginatorOrg: opensource.altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2015 16:32:42.0508 (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: BL2PR03MB228 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 --- v3: none 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