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: 69103 Delivered-To: patch@linaro.org Received: by 10.140.23.41 with SMTP id 38csp53938qgo; Wed, 1 Jun 2016 16:20:22 -0700 (PDT) X-Received: by 10.66.25.133 with SMTP id c5mr853730pag.103.1464823220986; Wed, 01 Jun 2016 16:20:20 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f66si27203522pfb.109.2016.06.01.16.20.20; Wed, 01 Jun 2016 16:20:20 -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 S1752751AbcFAXUR (ORCPT + 30 others); Wed, 1 Jun 2016 19:20:17 -0400 Received: from mail-pf0-f178.google.com ([209.85.192.178]:35789 "EHLO mail-pf0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752089AbcFAXQA (ORCPT ); Wed, 1 Jun 2016 19:16:00 -0400 Received: by mail-pf0-f178.google.com with SMTP id g64so23333505pfb.2 for ; Wed, 01 Jun 2016 16:16:00 -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=VY5SjoMk1IZH22LWiorkHlE0osT5M+AUkWqhaV7GsgUO1moHS1kRGHQTKyCQZkD93n nX55egygU3fZlqOqeEZ75KhYZujwdcxgUR2PXHFfJIhdfUKb5p5HD/z8fYG/Iy0P6avi Z/NonIk+jLtES7P9aeLuHrB+rMbgWcQVxd89xMgQHIXmfBWgESy92+072ULP/88lAe48 UUSK9f+/t7u5gZ6dMJQhRppLXG622r0PGqhSGRcSW+sr5NLjN6P0SSDT8N59tYzKyjt2 LgSeYSsXDwpIwDtFSpXREQHjWIpLzfUn9QadS6WjYvtTd8ETzD3yxfoGbr/vin26cuYJ GFLA== X-Gm-Message-State: ALyK8tKhJDv0BwmXorrzrtotuxaE4VIrQZnXgyKSmXZOcy4qnJ1mOiM0JiE42yVJqE3eWFZn 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-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: 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(-) -- 2.7.4 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)