From patchwork Thu Oct 17 16:30:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 3061851 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5C7049F3E2 for ; Thu, 17 Oct 2013 16:31:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C3D31202FF for ; Thu, 17 Oct 2013 16:31:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7817F20263 for ; Thu, 17 Oct 2013 16:31:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757395Ab3JQQbF (ORCPT ); Thu, 17 Oct 2013 12:31:05 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:51885 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757830Ab3JQQbD (ORCPT ); Thu, 17 Oct 2013 12:31:03 -0400 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MUT009VUN7NN610@mailout2.w1.samsung.com>; Thu, 17 Oct 2013 17:30:59 +0100 (BST) X-AuditID: cbfec7f4-b7f0a6d000007b1b-e4-526010c3e3fa Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 4F.AD.31515.3C010625; Thu, 17 Oct 2013 17:30:59 +0100 (BST) Received: from amdc1227.digital.local ([106.116.147.199]) by eusync1.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MUT00F39N7B2000@eusync1.samsung.com>; Thu, 17 Oct 2013 17:30:59 +0100 (BST) From: Tomasz Figa To: linux-arm-kernel@lists.infradead.org Cc: devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, Mike Turquette , Samuel Ortiz , Lee Jones , Tomasz Figa , Kyungmin Park Subject: [PATCH 4/8] clk: max77686: Make max77686_clk_register() return struct clk * Date: Thu, 17 Oct 2013 18:30:38 +0200 Message-id: <1382027442-1992-5-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.8.3.2 In-reply-to: <1382027442-1992-1-git-send-email-t.figa@samsung.com> References: <1382027442-1992-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBJMWRmVeSWpSXmKPExsVy+t/xy7qHBRKCDD4+F7CYf+Qcq8XZpjfs Fve/HmW02PT4GqvFjPP7mCyeTrjIZnG6m9Vi/YzXLA4cHneu7WHzmHcy0GPzknqPvi2rGD0+ b5ILYI3isklJzcksSy3St0vgyvh97QVzwQb+itMdpg2M+3i6GDk5JARMJB5PfsMKYYtJXLi3 nq2LkYtDSGApo8S+j6eZIJw+JomJW18wg1SxCahJfG54xAZiiwhoSEzpeswOUsQs0MIksWr9 ZyaQhLBAmMT8ez0sIDaLgKrEtFNbGEFsXgFHiZaOCcwQ6xQkln1ZC2ZzCjhJzFt8C6xGCKjm b+tzpgmMvAsYGVYxiqaWJhcUJ6XnGuoVJ+YWl+al6yXn525ihITWlx2Mi49ZHWIU4GBU4uE9 8C0+SIg1say4MvcQowQHs5IIbxxXQpAQb0piZVVqUX58UWlOavEhRiYOTqkGRsEJQT4ZU57+ bT7TJLTUu4A52qnOPkLqjOGDdEaegEN332zoFOZYvk7uavqtqp2dK2ay75rPPjv0+TGRQock 6303k5vU5jVXRf7+d2WKOGubzXWXOqf1bh+5zvz+c8OisvPshsiEOSvKS+7udJJbN/fxuaO6 jx1F3hrEyfIt+vycKTv+qmVZlxJLcUaioRZzUXEiAHy1YUQLAgAA Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 As a preparation for further patches, this patch modifies the clock registration helper function to return a pointer to the newly registered clock. No functional change is done to the driver. Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park --- drivers/clk/clk-max77686.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/clk/clk-max77686.c b/drivers/clk/clk-max77686.c index 5d78460..2e6ba0e 100644 --- a/drivers/clk/clk-max77686.c +++ b/drivers/clk/clk-max77686.c @@ -112,27 +112,26 @@ static struct clk_init_data max77686_clks_init[MAX77686_CLKS_NUM] = { }, }; -static int max77686_clk_register(struct device *dev, +static struct clk *max77686_clk_register(struct device *dev, struct max77686_clk *max77686) { struct clk *clk; struct clk_hw *hw = &max77686->hw; clk = clk_register(dev, hw); - if (IS_ERR(clk)) - return -ENOMEM; + return clk; max77686->lookup = kzalloc(sizeof(struct clk_lookup), GFP_KERNEL); if (!max77686->lookup) - return -ENOMEM; + return ERR_PTR(-ENOMEM); max77686->lookup->con_id = hw->init->name; max77686->lookup->clk = clk; clkdev_add(max77686->lookup); - return 0; + return clk; } static int max77686_clk_probe(struct platform_device *pdev) @@ -154,12 +153,16 @@ static int max77686_clk_probe(struct platform_device *pdev) } for (i = 0; i < MAX77686_CLKS_NUM; i++) { + struct clk *clk; + max77686_clks[i]->iodev = iodev; max77686_clks[i]->mask = 1 << i; max77686_clks[i]->hw.init = &max77686_clks_init[i]; - ret = max77686_clk_register(&pdev->dev, max77686_clks[i]); - if (ret) { + clk = max77686_clk_register(&pdev->dev, max77686_clks[i]); + if (IS_ERR(clk)) { + ret = PTR_ERR(clk); + switch (i) { case MAX77686_CLK_AP: dev_err(&pdev->dev, "Fail to register CLK_AP\n");