From patchwork Fri Sep 1 23:16:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 9935377 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 1B16360216 for ; Fri, 1 Sep 2017 23:17:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0EC022852B for ; Fri, 1 Sep 2017 23:17:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 03D262852D; Fri, 1 Sep 2017 23:17:22 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 A1F6F2852B for ; Fri, 1 Sep 2017 23:17:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752651AbdIAXQq (ORCPT ); Fri, 1 Sep 2017 19:16:46 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:37732 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752626AbdIAXQo (ORCPT ); Fri, 1 Sep 2017 19:16:44 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 6BD0160799; Fri, 1 Sep 2017 23:16:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1504307804; bh=TKc+PcynD6+lc8ZuupzpDelQsw4KFjy5DcY1aWesIpU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VxBlLatf6EYlI8Ero8HMANnvAtJNqmfn8pWPb9gIY3fepLOMIqRH4UdrWmikV0GXP Z0O8y7WL3caODlIEH6xJYKh4MdV0ZvqIQT5nieEwgD/NZKWTRPomWIA7J5OUYZcw2H kverA53msX62VPsZR0dZuaQ/i6CPpTa9cXqVfxyg= Received: from sboyd-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sboyd@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id A4D7B60738; Fri, 1 Sep 2017 23:16:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1504307803; bh=TKc+PcynD6+lc8ZuupzpDelQsw4KFjy5DcY1aWesIpU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kQWs20Sr+2ctkG4lOv83emwgkG3kKxjDYAB8wNw1SXTx63ezIzVERO+tqJXFh7bJX LNGGe7r00On8H9Onm2jCy3s4zlySFZl8Ly6xZ8SBd3l8OuNk0S51wfbEEbhxXwlsRT VZQBaqSQSFOxnoT9dRuKrV1y88F2UOYiV6ezBQEo= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org A4D7B60738 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sboyd@codeaurora.org From: Stephen Boyd To: Michael Turquette , Stephen Boyd Cc: linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, Tirupathi Reddy Subject: [PATCH 2/2] clk: qcom: common: Migrate to devm_* APIs for resets and clk providers Date: Fri, 1 Sep 2017 16:16:41 -0700 Message-Id: <20170901231641.19141-3-sboyd@codeaurora.org> X-Mailer: git-send-email 2.14.0 In-Reply-To: <20170901231641.19141-1-sboyd@codeaurora.org> References: <20170901231641.19141-1-sboyd@codeaurora.org> 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 Now that we have devm APIs for the reset controller and of clk hw provider APIs we can remove the custom code here. Signed-off-by: Stephen Boyd --- drivers/clk/qcom/common.c | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c index d523991c945f..b35564c0493f 100644 --- a/drivers/clk/qcom/common.c +++ b/drivers/clk/qcom/common.c @@ -111,16 +111,6 @@ qcom_pll_set_fsm_mode(struct regmap *map, u32 reg, u8 bias_count, u8 lock_count) } EXPORT_SYMBOL_GPL(qcom_pll_set_fsm_mode); -static void qcom_cc_del_clk_provider(void *data) -{ - of_clk_del_provider(data); -} - -static void qcom_cc_reset_unregister(void *data) -{ - reset_controller_unregister(data); -} - static void qcom_cc_gdsc_unregister(void *data) { gdsc_unregister(data); @@ -248,13 +238,7 @@ int qcom_cc_really_probe(struct platform_device *pdev, return ret; } - ret = of_clk_add_hw_provider(dev->of_node, qcom_cc_clk_hw_get, cc); - if (ret) - return ret; - - ret = devm_add_action_or_reset(dev, qcom_cc_del_clk_provider, - pdev->dev.of_node); - + ret = devm_of_clk_add_hw_provider(dev, qcom_cc_clk_hw_get, cc); if (ret) return ret; @@ -266,13 +250,7 @@ int qcom_cc_really_probe(struct platform_device *pdev, reset->regmap = regmap; reset->reset_map = desc->resets; - ret = reset_controller_register(&reset->rcdev); - if (ret) - return ret; - - ret = devm_add_action_or_reset(dev, qcom_cc_reset_unregister, - &reset->rcdev); - + ret = devm_reset_controller_register(dev, &reset->rcdev); if (ret) return ret;