From patchwork Wed Jun 1 23:15:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 69092 Delivered-To: patch@linaro.org Received: by 10.140.23.41 with SMTP id 38csp53490qgo; Wed, 1 Jun 2016 16:18:56 -0700 (PDT) X-Received: by 10.66.63.35 with SMTP id d3mr1076239pas.69.1464823136847; Wed, 01 Jun 2016 16:18:56 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v8si44833607pfa.147.2016.06.01.16.18.56; Wed, 01 Jun 2016 16:18:56 -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 S1752524AbcFAXSl (ORCPT + 30 others); Wed, 1 Jun 2016 19:18:41 -0400 Received: from mail-pf0-f170.google.com ([209.85.192.170]:33204 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751840AbcFAXQG (ORCPT ); Wed, 1 Jun 2016 19:16:06 -0400 Received: by mail-pf0-f170.google.com with SMTP id b124so23338914pfb.0 for ; Wed, 01 Jun 2016 16:16:06 -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 :mime-version:content-transfer-encoding; bh=XwCCV3rmiO7dzJ49VaEssyAVciq+OS6ACMzysVu17a8=; b=i445b5Hd7cB5V6rhwnsAow6xfA5rzo+ZHnVwV4n36kwzx6G80DtzA2aPSI4T0Cy1ds XbaqyY51+AZ3/g5ko6oo1HgUzgqkZ/+vCBfB7VQOhaAhg9A45ubFAHESS07BW3zMHxli R1crJgk+XpmjdW1p+sqDbufeuA+xIrFR4SZuI= 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:mime-version:content-transfer-encoding; bh=XwCCV3rmiO7dzJ49VaEssyAVciq+OS6ACMzysVu17a8=; b=Jqf6gUQE0UmFKSQvRPq+9DDa3U7S5idquKOnS8Pc8EeKFls2S5GC3ggyynhwLoVyGX dde8zsOygt1532qe948cfCZKx+jisL+UM1vBfZziL+Kntb7fu2V5e4M7YwkA5OfVxY5g ivLuKj8kPUVO1rGjlTJjgh7mY694JL1SPqvKC/RU714Ht7v0lbHq9zJ0yZlcaEyMxIuq WF2hR7iIug15q89hZsnaQzeEU4gmi7UULlbJSxOdq+/RVAK48NhdNQiw3dKbYvvtCKNm t7g4TlFSK0GnADaGEXiDuig0Naa+QLV+J0JDC0ybzh5OBbP9SPHpZEUg8kkAv/IBrvvn VDxQ== X-Gm-Message-State: ALyK8tKbmNcY/A2pogfdqJWk4KRHn+2gLWpCJ8tZyWFJ+8PU3fWL8W0/07No8yJUFLCVsz5V X-Received: by 10.98.36.140 with SMTP id k12mr13623298pfk.118.1464822965653; Wed, 01 Jun 2016 16:16:05 -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.16.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Jun 2016 16:16:05 -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, Guenter Roeck , =?UTF-8?q?S=C3=B6ren=20Brinkmann?= Subject: [PATCH 29/34] clk: si570: Migrate to clk_hw based OF and registration APIs Date: Wed, 1 Jun 2016 16:15:28 -0700 Message-Id: <20160601231533.9354-30-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> MIME-Version: 1.0 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: Guenter Roeck Cc: Sören Brinkmann Signed-off-by: Stephen Boyd --- See commit 58657d189a2f and it's children for details on this new registration API. drivers/clk/clk-si570.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) -- 2.7.4 diff --git a/drivers/clk/clk-si570.c b/drivers/clk/clk-si570.c index d56648521a95..646af1d1898d 100644 --- a/drivers/clk/clk-si570.c +++ b/drivers/clk/clk-si570.c @@ -408,7 +408,6 @@ static int si570_probe(struct i2c_client *client, { struct clk_si570 *data; struct clk_init_data init; - struct clk *clk; u32 initial_fout, factory_fout, stability; int err; enum clk_si570_variant variant = id->driver_data; @@ -462,13 +461,13 @@ static int si570_probe(struct i2c_client *client, if (err) return err; - clk = devm_clk_register(&client->dev, &data->hw); - if (IS_ERR(clk)) { + err = devm_clk_hw_register(&client->dev, &data->hw); + if (err) { dev_err(&client->dev, "clock registration failed\n"); - return PTR_ERR(clk); + return err; } - err = of_clk_add_provider(client->dev.of_node, of_clk_src_simple_get, - clk); + err = of_clk_add_hw_provider(client->dev.of_node, of_clk_hw_simple_get, + &data->hw); if (err) { dev_err(&client->dev, "unable to add clk provider\n"); return err; @@ -477,7 +476,7 @@ static int si570_probe(struct i2c_client *client, /* Read the requested initial output frequency from device tree */ if (!of_property_read_u32(client->dev.of_node, "clock-frequency", &initial_fout)) { - err = clk_set_rate(clk, initial_fout); + err = clk_set_rate(data->hw.clk, initial_fout); if (err) { of_clk_del_provider(client->dev.of_node); return err;