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: 83233 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp1542213qge; Mon, 21 Nov 2016 06:04:58 -0800 (PST) X-Received: by 10.13.217.85 with SMTP id b82mr13814085ywe.81.1479737098366; Mon, 21 Nov 2016 06:04:58 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n195si4778254ywd.35.2016.11.21.06.04.58; Mon, 21 Nov 2016 06:04:58 -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 S1753495AbcKUOEy (ORCPT + 26 others); Mon, 21 Nov 2016 09:04:54 -0500 Received: from mail-wm0-f49.google.com ([74.125.82.49]:36799 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753159AbcKUOEx (ORCPT ); Mon, 21 Nov 2016 09:04:53 -0500 Received: by mail-wm0-f49.google.com with SMTP id g23so148960488wme.1 for ; Mon, 21 Nov 2016 06:04: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; 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=JkLZ5eFUVWaHx/9+beclEiM1d6Vo1shQRHGBYS2GffGwd/no38hPea4kzU3MLJuv+1 Lfygd1WfEPokt1rf7+S1R4rIw1qgBH3CpcRp2MaYtdhZI1Qp39Ik8+FyylR9MV6XwnPt t5Xa8UbooXHSQG4EHV8hagU/ORxRq+x9RyzsKcpvY+yPvMMGRxDP8roSxSwb1DVFq6J4 zNP4zD3jBF4g9JZRNF63hPeu34bPlg7xWtR5h5+5oktCnzTi5ZwxMdHk442EQyVpOHqs uQ5z7RosIWrdWGUCM72TsKMx+TjXi6DVoDgfd1LStRlGJ8y83/5XymOKDiLQZvRV5iAq 2n7Q== X-Gm-Message-State: AKaTC0353SPtl61x2+pB7/niH6HoaiBkjDRnFVI20fFZ5BwaVYlg1ae8FtSj9U8Nwe79dXIA 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) 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;