From patchwork Wed Nov 23 14:52:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 83693 Delivered-To: patch@linaro.org Received: by 10.182.1.168 with SMTP id 8csp2756859obn; Wed, 23 Nov 2016 06:58:16 -0800 (PST) X-Received: by 10.99.102.69 with SMTP id a66mr5809596pgc.49.1479913096040; Wed, 23 Nov 2016 06:58:16 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 71si34224538pfj.64.2016.11.23.06.58.14; Wed, 23 Nov 2016 06:58:16 -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 S965114AbcKWOzl (ORCPT + 25 others); Wed, 23 Nov 2016 09:55:41 -0500 Received: from mail-wm0-f52.google.com ([74.125.82.52]:38866 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S938259AbcKWOxw (ORCPT ); Wed, 23 Nov 2016 09:53:52 -0500 Received: by mail-wm0-f52.google.com with SMTP id f82so27283855wmf.1 for ; Wed, 23 Nov 2016 06:52:52 -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:in-reply-to:references; bh=we9yb7wmE7P1mIUaEg9MIhy63KlaQc7FiUZIQEyeGJ4=; b=GPrOo3r77VKCNUJeePUBTiDPpMmRFP3zKJFflcxyzQNXv+CZbrIv5HDJun0r4iiR+C BYqA+CwWYXJ4Ve2F3giX78aKTf5UfXnBSS0GApRHq4pIN5SWK0u9fnVWK1EyOBD5ytfL 0krl/aN4RPD+WP3+sSjgerlzYZ46q6U/wD/p4= 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=we9yb7wmE7P1mIUaEg9MIhy63KlaQc7FiUZIQEyeGJ4=; b=NS7mBaUiTSang49DEA+wZPerKRz96P40fOXPHE8OvpBb6VTbF3LQ141e9bzWmJrzF9 tCEcSQ/IgZFIzggdFCPfTcpSmZO6ePdJaPlrvxyY7HtID8eUAr4bv4APG17DE8aNFicm M2HSJNzyate8q51w7xDOD8+TlU8bbfNOkNAMW2Rrm9nJNmqcaAiAxIEJAa4pfYXpa0AU Xw7CN2TwyX4wJiMY2nWQpND5Fm7D+qtNTfjRYagnnyundefc0g9yu4QpxHbFv/orRBsi C5MT5AW7EKRQ/J6dn9Z518HZJMu6hHCbEmj8KdkxE8sOn9j2TObeOHkyhIB6LxLi3VCA Va2A== X-Gm-Message-State: AKaTC010GcnEzMqZ2KntfkG2w6XZHdK296G4mpWRQ08AirXkD8D7fQQ/zFYgoPPmJwGH2A23 X-Received: by 10.194.94.132 with SMTP id dc4mr3511679wjb.231.1479912771769; Wed, 23 Nov 2016 06:52:51 -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.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Nov 2016 06:52:50 -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 2/2] clk: qcom: clk-rpm: Fix clk_hw references Date: Wed, 23 Nov 2016 16:52:49 +0200 Message-Id: <20161123145249.14912-2-georgi.djakov@linaro.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161123145249.14912-1-georgi.djakov@linaro.org> References: <20161123145249.14912-1-georgi.djakov@linaro.org> 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-rpm.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/drivers/clk/qcom/clk-rpm.c b/drivers/clk/qcom/clk-rpm.c index 1950a9572624..df3e5fe8442a 100644 --- a/drivers/clk/qcom/clk-rpm.c +++ b/drivers/clk/qcom/clk-rpm.c @@ -127,8 +127,8 @@ struct clk_rpm { struct rpm_cc { struct qcom_rpm *rpm; - struct clk_hw_onecell_data data; - struct clk_hw *hws[]; + struct clk_rpm **clks; + size_t num_clks; }; struct rpm_clk_desc { @@ -391,11 +391,23 @@ static const struct of_device_id rpm_clk_match_table[] = { }; MODULE_DEVICE_TABLE(of, rpm_clk_match_table); +static struct clk_hw *qcom_rpm_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_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_rpm *rpm; @@ -415,14 +427,12 @@ static int rpm_clk_probe(struct platform_device *pdev) rpm_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_clks; + rcc->num_clks = num_clks; for (i = 0; i < num_clks; i++) { if (!rpm_clks[i]) @@ -436,18 +446,16 @@ static int rpm_clk_probe(struct platform_device *pdev) } for (i = 0; i < num_clks; i++) { - if (!rpm_clks[i]) { - data->hws[i] = ERR_PTR(-ENOENT); + if (!rpm_clks[i]) continue; - } ret = devm_clk_hw_register(&pdev->dev, &rpm_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_rpm_clk_hw_get, + rcc); if (ret) goto err;