From patchwork Mon Nov 21 14:04: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: 9439465 X-Patchwork-Delegate: agross@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 33CBF606DB for ; Mon, 21 Nov 2016 14:11:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E0FD28ACA for ; Mon, 21 Nov 2016 14:11:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1297728AE6; Mon, 21 Nov 2016 14:11:01 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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 A42AD28AD1 for ; Mon, 21 Nov 2016 14:11:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752891AbcKUOLA (ORCPT ); Mon, 21 Nov 2016 09:11:00 -0500 Received: from mail-wj0-f179.google.com ([209.85.210.179]:32841 "EHLO mail-wj0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752545AbcKUOK7 (ORCPT ); Mon, 21 Nov 2016 09:10:59 -0500 X-Greylist: delayed 366 seconds by postgrey-1.27 at vger.kernel.org; Mon, 21 Nov 2016 09:10:59 EST Received: by mail-wj0-f179.google.com with SMTP id xy5so27016595wjc.0 for ; Mon, 21 Nov 2016 06:10:58 -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=VHQhz5ojLQXigl7KNtWvpuQreq0lHKgsM6EuKq1H9uo=; b=B57cDtwVfLXSL7Ifoknt2l2CzmoLO0dvtMrMnyXSOpnFlXKK9Jn8jkCf3s3EiClsfr GH9I4v64/MGEwhM/78AVgT+u2zamnylaLQXpHQYGoIxLdKW1BIs4HC5Aj0mK1HSJQPSc H7aV9nZc/a12LaPW4g/ypfqGyH3X6d1jnz5b0= 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=VHQhz5ojLQXigl7KNtWvpuQreq0lHKgsM6EuKq1H9uo=; b=HG8Ly3FCNzDedjD42D3rIkv0ApNsqNO2JEWnaSV/YDadALyRqHdZwoU/hwXCPjo94Z y9MQs1hbxyQspJdhFPqnT3Mf0IsuKV4x3AA3zIFJztELu7dpfCPe+I90uRHHg11re1IT wpRmnzicWXZ8BvwI5b+TAfO9cbLcGsNLjrtHY3PAxCWNpUL1kSgi0KCutrgc32XrO3tZ ynfctqJP9ZC4B0lFUYsweEtIoYg9VUWheS+M3QJ4VwZS0pQ7c7AdhXKXVpwuy7QQcTFf Ly/gNNVQH01npeGV2+HgIp4CZTFkucL2pRCG/0JZtdyWm0oVuDi+FnzSP/fmqeuhj1fB QYqQ== X-Gm-Message-State: AKaTC031lKAbN+apoK0MAPnT+T+WAJuh2nimDfz/qwwsMl2FY28utcElrw/XoJH1CIPJMggn X-Received: by 10.194.107.97 with SMTP id hb1mr4238592wjb.134.1479737091930; Mon, 21 Nov 2016 06:04:51 -0800 (PST) Received: from mms-0441.wifi.mm-sol.com ([212.45.67.2]) by smtp.googlemail.com with ESMTPSA id x188sm19707476wmx.4.2016.11.21.06.04.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Nov 2016 06:04: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 1/2] clk: qcom: clk-smd-rpm: Fix clk_hw_onecell_data references Date: Mon, 21 Nov 2016 16:04:49 +0200 Message-Id: <20161121140450.12353-1-georgi.djakov@linaro.org> X-Mailer: git-send-email 2.10.2 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The clk_hw_onecell_data struct is missing references to the actual clocks. Fix this. Reported-by: Michael Scott Signed-off-by: Georgi Djakov --- drivers/clk/qcom/clk-smd-rpm.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" 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..58821f7213b0 100644 --- a/drivers/clk/qcom/clk-smd-rpm.c +++ b/drivers/clk/qcom/clk-smd-rpm.c @@ -148,8 +148,7 @@ struct clk_smd_rpm_req { struct rpm_cc { struct qcom_rpm *rpm; - struct clk_hw_onecell_data data; - struct clk_hw *hws[]; + struct clk_hw_onecell_data *data; }; struct rpm_smd_clk_desc { @@ -470,9 +469,7 @@ MODULE_DEVICE_TABLE(of, rpm_smd_clk_match_table); 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 +489,13 @@ 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->data = devm_kzalloc(&pdev->dev, sizeof(*rcc->data) + num_clks * + sizeof(*rcc->data->hws), GFP_KERNEL); + rcc->data->num = num_clks; for (i = 0; i < num_clks; i++) { if (!rpm_smd_clks[i]) @@ -518,17 +514,19 @@ static int rpm_smd_clk_probe(struct platform_device *pdev) for (i = 0; i < num_clks; i++) { if (!rpm_smd_clks[i]) { - data->hws[i] = ERR_PTR(-ENOENT); + rcc->data->hws[i] = ERR_PTR(-ENOENT); continue; } ret = devm_clk_hw_register(&pdev->dev, &rpm_smd_clks[i]->hw); if (ret) goto err; + + rcc->data->hws[i] = &rpm_smd_clks[i]->hw; } ret = of_clk_add_hw_provider(pdev->dev.of_node, of_clk_hw_onecell_get, - data); + rcc->data); if (ret) goto err;