From patchwork Tue Aug 16 22:37:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 74044 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp2226103qga; Tue, 16 Aug 2016 15:45:57 -0700 (PDT) X-Received: by 10.98.149.131 with SMTP id c3mr69249746pfk.73.1471387557071; Tue, 16 Aug 2016 15:45:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i7si34079049pai.287.2016.08.16.15.45.56; Tue, 16 Aug 2016 15:45:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753430AbcHPWpy (ORCPT + 27 others); Tue, 16 Aug 2016 18:45:54 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:34251 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752529AbcHPWpx (ORCPT ); Tue, 16 Aug 2016 18:45:53 -0400 Received: by mail-pa0-f41.google.com with SMTP id fi15so30332964pac.1 for ; Tue, 16 Aug 2016 15:45:52 -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; bh=G/pMldiYN3dq1dVPMc8An612ylRTyCzevHKzT+oUuf0=; b=gjO5MFha8bX9ErAKfF5vnYovkW890WFqs6VgWAEOePp/SBQytUOCbe0afIIIO/UvBC 9XNRKQM3JrPYnw9uo85p4dUAYNClZmjzWLpXhaZEi+S9pX5wiROqGFuKTXKC5Y3XavG9 P+dFcMRtU2rzUAH14PfsCDRYMCwiBA3FQ85BI= 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; bh=G/pMldiYN3dq1dVPMc8An612ylRTyCzevHKzT+oUuf0=; b=E0osLUhfzCwG2JCEgsQur6MWX0uYhTvm0qbeIL04xs3lztYDXaVCFuMG6loDfc4Dxj Kpr2ETRVJ1R4wipJ9LidJIUgR/OSjs++rRT37KBxpxrBAMpbbTuRjXkl7VNj0NmoWqvL xm2t5krenXqOWVSy3tevzHGfO7IUGtWVSP8PQV7GWaHm/cOnmDTF8i3IZrSCxVLN8rLz zm2GW7YXtzQ8gOu8tFSTYUbjf+vh96v4ia8SuF3ktd6zf/TNcXL1jZNbphFOflcsAQz1 sopXuDadKuxtbS6mzakTjDwT32MKU/J8dVgx9T+48DD2Z9FmuRUNZ4H2mcwvEu9O+w6f /ttQ== X-Gm-Message-State: AEkoouvU1A5y5ajNR8qkZkLdZQdEzdxkLiL1fkKr6SJpIetZ/3CJ/2cp0GwOO8KpRQSE8mZc X-Received: by 10.66.80.2 with SMTP id n2mr68094479pax.134.1471387080373; Tue, 16 Aug 2016 15:38:00 -0700 (PDT) Received: from localhost.localdomain (ip68-101-172-78.sd.sd.cox.net. [68.101.172.78]) by smtp.gmail.com with ESMTPSA id k78sm41724521pfa.78.2016.08.16.15.37.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 16 Aug 2016 15:37:59 -0700 (PDT) From: Stephen Boyd To: Michael Turquette , Stephen Boyd Cc: linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, Yoshinori Sato , uclinux-h8-devel@lists.sourceforge.jp Subject: [PATCH] clk: h8300: Migrate to clk_hw based registration APIs Date: Tue, 16 Aug 2016 15:37:57 -0700 Message-Id: <20160816223757.726-1-stephen.boyd@linaro.org> X-Mailer: git-send-email 2.9.0.rc2.8.ga28705d Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: Yoshinori Sato Cc: Signed-off-by: Stephen Boyd --- drivers/clk/h8300/clk-div.c | 10 +++++----- drivers/clk/h8300/clk-h8s2678.c | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) -- 2.9.0.rc2.8.ga28705d diff --git a/drivers/clk/h8300/clk-div.c b/drivers/clk/h8300/clk-div.c index 4bf44a25d950..715b882205a8 100644 --- a/drivers/clk/h8300/clk-div.c +++ b/drivers/clk/h8300/clk-div.c @@ -14,7 +14,7 @@ static DEFINE_SPINLOCK(clklock); static void __init h8300_div_clk_setup(struct device_node *node) { unsigned int num_parents; - struct clk *clk; + struct clk_hw *hw; const char *clk_name = node->name; const char *parent_name; void __iomem *divcr = NULL; @@ -38,15 +38,15 @@ static void __init h8300_div_clk_setup(struct device_node *node) parent_name = of_clk_get_parent_name(node, 0); of_property_read_u32(node, "renesas,width", &width); - clk = clk_register_divider(NULL, clk_name, parent_name, + hw = clk_hw_register_divider(NULL, clk_name, parent_name, CLK_SET_RATE_GATE, divcr, offset, width, CLK_DIVIDER_POWER_OF_TWO, &clklock); - if (!IS_ERR(clk)) { - of_clk_add_provider(node, of_clk_src_simple_get, clk); + if (!IS_ERR(hw)) { + of_clk_add_hw_provider(node, of_clk_hw_simple_get, hw); return; } pr_err("%s: failed to register %s div clock (%ld)\n", - __func__, clk_name, PTR_ERR(clk)); + __func__, clk_name, PTR_ERR(hw)); error: if (divcr) iounmap(divcr); diff --git a/drivers/clk/h8300/clk-h8s2678.c b/drivers/clk/h8300/clk-h8s2678.c index c9c2fd575ef7..a26312460621 100644 --- a/drivers/clk/h8300/clk-h8s2678.c +++ b/drivers/clk/h8300/clk-h8s2678.c @@ -84,11 +84,11 @@ static const struct clk_ops pll_ops = { static void __init h8s2678_pll_clk_setup(struct device_node *node) { unsigned int num_parents; - struct clk *clk; const char *clk_name = node->name; const char *parent_name; struct pll_clock *pll_clock; struct clk_init_data init; + int ret; num_parents = of_clk_get_parent_count(node); if (!num_parents) { @@ -121,14 +121,14 @@ static void __init h8s2678_pll_clk_setup(struct device_node *node) init.num_parents = 1; pll_clock->hw.init = &init; - clk = clk_register(NULL, &pll_clock->hw); - if (IS_ERR(clk)) { - pr_err("%s: failed to register %s div clock (%ld)\n", - __func__, clk_name, PTR_ERR(clk)); + ret = clk_hw_register(NULL, &pll_clock->hw); + if (ret) { + pr_err("%s: failed to register %s div clock (%d)\n", + __func__, clk_name, ret); goto unmap_pllcr; } - of_clk_add_provider(node, of_clk_src_simple_get, clk); + of_clk_add_hw_provider(node, of_clk_hw_simple_get, &pll_clock->hw); return; unmap_pllcr: