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: 9443565 X-Patchwork-Delegate: sboyd@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6FB1260235 for ; Wed, 23 Nov 2016 14:58:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6267426D08 for ; Wed, 23 Nov 2016 14:58:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 572CB26D19; Wed, 23 Nov 2016 14:58:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 059D626D08 for ; Wed, 23 Nov 2016 14:58:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965000AbcKWOzk (ORCPT ); Wed, 23 Nov 2016 09:55:40 -0500 Received: from mail-wm0-f53.google.com ([74.125.82.53]:35237 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936434AbcKWOxw (ORCPT ); Wed, 23 Nov 2016 09:53:52 -0500 Received: by mail-wm0-f53.google.com with SMTP id a197so81271090wmd.0 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=QaM7fFEVXMwJd2QZFNclzNIpg2UBk2+bf+AizNRvW0kusPeUfm4PhoVZ7TAsFd9VOw fnkBBsS0VExgB3uClU69Kge842Vft50D/JqzipZU8pOynkxZdvta/zgMmHQECEfj5ZMR FsAGiugqG0mVrCH8fYWKncYgEUcBWo6AbP3wiiQZDJFVXduYsCfd96GE5tuqyaSphBye hYu2mQWZ4vtd1CkeSYt9qt4yRWbD7Y3kqgDfVhP/Nw/vHVS1yzGH2JNRVAOQM8uCX1jA 9d2MfroxHz/LDm/VI20IDBAPycZ9rXQt5BpJXpg1MddVSx0UCr1qakhfFP2Yf+3Y6naT fBsQ== X-Gm-Message-State: AKaTC02hNbDSvN71jpJ6wROgP0e3dqj2265oVsmZY4kJB/F0QMobnztgyYB+YPTe0zk0pPUa 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-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) -- To unsubscribe from this list: send the line "unsubscribe linux-clk" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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;