From patchwork Wed Jun 1 23:15:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 9148651 X-Patchwork-Delegate: sboyd@codeaurora.org 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 543A660751 for ; Wed, 1 Jun 2016 23:18:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 473DB271CB for ; Wed, 1 Jun 2016 23:18:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C107271FD; Wed, 1 Jun 2016 23:18:57 +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 BD9AD271CB for ; Wed, 1 Jun 2016 23:18:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751840AbcFAXSl (ORCPT ); Wed, 1 Jun 2016 19:18:41 -0400 Received: from mail-pf0-f173.google.com ([209.85.192.173]:33189 "EHLO mail-pf0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752198AbcFAXQF (ORCPT ); Wed, 1 Jun 2016 19:16:05 -0400 Received: by mail-pf0-f173.google.com with SMTP id b124so23338137pfb.0 for ; Wed, 01 Jun 2016 16:16:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=z7/NYEkSGM5QVx5bLc6Xkrs4tw1FpwrFe2jlXk/oqaI=; b=XACytuJGjKSBryqNde/K+eETJTHwv+XSupRQDVb6PyASReqLWflzxaMDiz1KBJaEy7 CoF9sOo1NHWjqY7d7VasUhV07MU4bZ65MZW9ozNzR0q6C3xvpkVeBcm2bWAPs50WZrAW i+HhD3B/Iw6U9JmoEHtJyPl0qKAiYyoWbSEFc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=z7/NYEkSGM5QVx5bLc6Xkrs4tw1FpwrFe2jlXk/oqaI=; b=TfHJHSRgYlqUBCqh0Ql6SHd7G6Lm6nfMVUTaE40sFGDUO6QGEOQ37hc/MKV51T1lg+ 5bx0lle/rc1zn9ZfivaiAIViUCjY0SXmrItc/A/LQbbczRe2xU1tTVPhyP+AW7NIt0TM cpjJNvvPSQzBraeB587MOCE7vw11J+CXA6My2lKG8rrPZzPRSCcx7L7K7As5hqstR4BA NTesjDbN/S/yoWEeSPezbXrKgMN39AauUsMXVujje8HxcyZYsN+X1NHkdmtmjd9Nsz8/ +Tr6UfaouvNxDU3+uII+ChUxMcatyNy65dWwKruuRodqnwtvhMZ2p4LZS0Hm46rq9D0x s9dg== X-Gm-Message-State: ALyK8tJOEy58xJAcKyR/33XtOHAIMrfWdEMa9NSFmaM3T2RKsBDI5o5BxHKALTqRK8T6ZXuZ X-Received: by 10.98.94.194 with SMTP id s185mr13558116pfb.32.1464822959895; Wed, 01 Jun 2016 16:15:59 -0700 (PDT) Received: from localhost.localdomain (pat_11.qualcomm.com. [192.35.156.11]) by smtp.gmail.com with ESMTPSA id r64sm20967395pfi.54.2016.06.01.16.15.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Jun 2016 16:15:59 -0700 (PDT) From: Stephen Boyd To: Michael Turquette , Stephen Boyd Cc: linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Janusz Uzycki , Philipp Zabel Subject: [PATCH 23/34] clk: pwm: Migrate to clk_hw based OF and registration APIs Date: Wed, 1 Jun 2016 16:15:22 -0700 Message-Id: <20160601231533.9354-24-stephen.boyd@linaro.org> X-Mailer: git-send-email 2.9.0-rc1 In-Reply-To: <20160601231533.9354-1-stephen.boyd@linaro.org> References: <20160601231533.9354-1-stephen.boyd@linaro.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 clk_hw based provider APIs to register clks, we can get rid of struct clk pointers while registering clks in these drivers, allowing us to move closer to a clear split of consumer and provider clk APIs. Cc: Janusz Uzycki Cc: Philipp Zabel Signed-off-by: Stephen Boyd --- See commit 58657d189a2f and it's children for details on this new registration API. drivers/clk/clk-pwm.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/clk/clk-pwm.c b/drivers/clk/clk-pwm.c index 1630a1f085f7..8cb9d117fdbf 100644 --- a/drivers/clk/clk-pwm.c +++ b/drivers/clk/clk-pwm.c @@ -61,7 +61,6 @@ static int clk_pwm_probe(struct platform_device *pdev) struct pwm_device *pwm; struct pwm_args pargs; const char *clk_name; - struct clk *clk; int ret; clk_pwm = devm_kzalloc(&pdev->dev, sizeof(*clk_pwm), GFP_KERNEL); @@ -107,11 +106,11 @@ static int clk_pwm_probe(struct platform_device *pdev) clk_pwm->pwm = pwm; clk_pwm->hw.init = &init; - clk = devm_clk_register(&pdev->dev, &clk_pwm->hw); - if (IS_ERR(clk)) - return PTR_ERR(clk); + ret = devm_clk_hw_register(&pdev->dev, &clk_pwm->hw); + if (ret) + return ret; - return of_clk_add_provider(node, of_clk_src_simple_get, clk); + return of_clk_add_hw_provider(node, of_clk_hw_simple_get, &clk_pwm->hw); } static int clk_pwm_remove(struct platform_device *pdev)