From patchwork Wed Nov 23 14:52:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 83692 Delivered-To: patch@linaro.org Received: by 10.182.1.168 with SMTP id 8csp2756478obn; Wed, 23 Nov 2016 06:57:22 -0800 (PST) X-Received: by 10.99.164.9 with SMTP id c9mr5889718pgf.141.1479913042213; Wed, 23 Nov 2016 06:57:22 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f71si34229706pfe.260.2016.11.23.06.57.21; Wed, 23 Nov 2016 06:57:22 -0800 (PST) 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 S965163AbcKWOzm (ORCPT + 25 others); Wed, 23 Nov 2016 09:55:42 -0500 Received: from mail-wm0-f49.google.com ([74.125.82.49]:36735 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S937116AbcKWOxw (ORCPT ); Wed, 23 Nov 2016 09:53:52 -0500 Received: by mail-wm0-f49.google.com with SMTP id g23so81398488wme.1 for ; Wed, 23 Nov 2016 06:52:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=jffqBeCKlo+YNyAzAuxqo4RnUGBxNkMIhNLKJz6llPI=; b=RGCWvcuaR5aX7jn32dhVEg04rU+eDZtk6C/IHV/0VxDO4KXpC3o4sskTOlp0XsSWMQ CmbBPkvcH5QrEd1zalzGn8tm4OS9wt3Bwg/12ENESpzxOoHysvJ/xWUBkxtIMQkWAuEo BXxAVUIRC75HnKVFVhtLgLhjWOOikFoK2JSfI= 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=jffqBeCKlo+YNyAzAuxqo4RnUGBxNkMIhNLKJz6llPI=; b=MwMLEKUGTOUWQUiCwQnJ634s9lQ6pIZa+8Rq5E/j4rgvYIk8MJhvB3H4aUfo5L4WyP goqnAK4uyV27HxEMMn0GKE1fRqFzJ3xXVjYglM7rWPnrhOw6x7khL2xNEecERKodOVqC b+cWL57EsOauK0WSzIgBNo2TSGuWRtnQLz+WIrE5UsLTyKwzJXcvyDP8wQLE17zUhCAm Ds2QdZgmxs3gKE3YYW+g8FObQ7vjrvpvjB/8bz+SRDYLmDhRFQX/09KH04v7azNN4b4f nTxrXJDqcC6FaJYaCElBHhym65kpF0DLH90lX6lKn9nMPAPBL/qAXZhbqUdCj1/1589l BdAA== X-Gm-Message-State: AKaTC00D+jdrIxp46e1zPxll8xGVSGkvaofafWVrcc2SNmg8vNDNc7Qvk9RpZL4A6FKU7QYg X-Received: by 10.194.115.226 with SMTP id jr2mr3500518wjb.75.1479912770343; Wed, 23 Nov 2016 06:52:50 -0800 (PST) Received: from mms-0441.wifi.mm-sol.com ([212.45.67.2]) by smtp.googlemail.com with ESMTPSA id di9sm36757908wjc.37.2016.11.23.06.52.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Nov 2016 06:52:49 -0800 (PST) From: Georgi Djakov To: sboyd@codeaurora.org Cc: mturquette@baylibre.com, linux-clk@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, michael.scott@linaro.org, georgi.djakov@linaro.org Subject: [PATCH v2 1/2] clk: qcom: clk-smd-rpm: Fix clk_hw references Date: Wed, 23 Nov 2016 16:52:48 +0200 Message-Id: <20161123145249.14912-1-georgi.djakov@linaro.org> X-Mailer: git-send-email 2.10.2 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix the clk_hw references to the actual clocks and add a xlate function to return the hw pointers from the already existing static array. Reported-by: Michael Scott Signed-off-by: Georgi Djakov --- drivers/clk/qcom/clk-smd-rpm.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c index a27013dbc0aa..07e2cc6ed781 100644 --- a/drivers/clk/qcom/clk-smd-rpm.c +++ b/drivers/clk/qcom/clk-smd-rpm.c @@ -148,8 +148,8 @@ struct clk_smd_rpm_req { struct rpm_cc { struct qcom_rpm *rpm; - struct clk_hw_onecell_data data; - struct clk_hw *hws[]; + struct clk_smd_rpm **clks; + size_t num_clks; }; struct rpm_smd_clk_desc { @@ -468,11 +468,23 @@ static const struct of_device_id rpm_smd_clk_match_table[] = { }; MODULE_DEVICE_TABLE(of, rpm_smd_clk_match_table); +static struct clk_hw *qcom_smdrpm_clk_hw_get(struct of_phandle_args *clkspec, + void *data) +{ + struct rpm_cc *rcc = data; + unsigned int idx = clkspec->args[0]; + + if (idx >= rcc->num_clks) { + pr_err("%s: invalid index %u\n", __func__, idx); + return ERR_PTR(-EINVAL); + } + + return rcc->clks[idx] ? &rcc->clks[idx]->hw : ERR_PTR(-ENOENT); +} + static int rpm_smd_clk_probe(struct platform_device *pdev) { - struct clk_hw **hws; struct rpm_cc *rcc; - struct clk_hw_onecell_data *data; int ret; size_t num_clks, i; struct qcom_smd_rpm *rpm; @@ -492,14 +504,12 @@ static int rpm_smd_clk_probe(struct platform_device *pdev) rpm_smd_clks = desc->clks; num_clks = desc->num_clks; - rcc = devm_kzalloc(&pdev->dev, sizeof(*rcc) + sizeof(*hws) * num_clks, - GFP_KERNEL); + rcc = devm_kzalloc(&pdev->dev, sizeof(*rcc), GFP_KERNEL); if (!rcc) return -ENOMEM; - hws = rcc->hws; - data = &rcc->data; - data->num = num_clks; + rcc->clks = rpm_smd_clks; + rcc->num_clks = num_clks; for (i = 0; i < num_clks; i++) { if (!rpm_smd_clks[i]) @@ -517,18 +527,16 @@ static int rpm_smd_clk_probe(struct platform_device *pdev) goto err; for (i = 0; i < num_clks; i++) { - if (!rpm_smd_clks[i]) { - data->hws[i] = ERR_PTR(-ENOENT); + if (!rpm_smd_clks[i]) continue; - } ret = devm_clk_hw_register(&pdev->dev, &rpm_smd_clks[i]->hw); if (ret) goto err; } - ret = of_clk_add_hw_provider(pdev->dev.of_node, of_clk_hw_onecell_get, - data); + ret = of_clk_add_hw_provider(pdev->dev.of_node, qcom_smdrpm_clk_hw_get, + rcc); if (ret) goto err;