From patchwork Mon Nov 21 14:04:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 9439457 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 EAAD46075D for ; Mon, 21 Nov 2016 14:05:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3E71289DB for ; Mon, 21 Nov 2016 14:05:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B8BAF289D2; Mon, 21 Nov 2016 14:05: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=ham 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 5130E289DB for ; Mon, 21 Nov 2016 14:05:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753159AbcKUOE4 (ORCPT ); Mon, 21 Nov 2016 09:04:56 -0500 Received: from mail-wm0-f44.google.com ([74.125.82.44]:34264 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753176AbcKUOEy (ORCPT ); Mon, 21 Nov 2016 09:04:54 -0500 Received: by mail-wm0-f44.google.com with SMTP id u144so21696992wmu.1 for ; Mon, 21 Nov 2016 06:04:54 -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=ehbdvpNI9I+nD1ZpnxLtaFtsfGdHjUI7fSafDJbv1cc=; b=g8cHjBFvV3ifrlQlaGwEuVnkuRPy6AeLODN+Jx/fQ6JkYM9O47jUnAx6xGH74SLDjN THjuhSNboLYQb8s74JzWiL0YEPWQNh5Sl2k3NtsXt+m+h+TfVMrf7uCHxqduAIFXr1kE USD6+NcuKLsahig6Q0+p1KzdJWp5ic23ZJ7Yk= 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=ehbdvpNI9I+nD1ZpnxLtaFtsfGdHjUI7fSafDJbv1cc=; b=gb+RtOOiAm9ai465uLo7sKtb/Hm+3gX1IAwErKTHZIg+78H/AOmGh48Jv1nSJhFPbl Az8jT3evwNRR6ZzPYGRyD7sVlzfRQUMhZ6GAWtUUKsuYaJ63y9zRLuCc8UhwxOFkudBV eeULgpFiCzPc7JcLm6qH96Kf7e9y+7llp5DP9yHCyqfEzh7xSJGXPX7Q+F4lj7lgIA2b 8T7j+tFUU4moGHIwHfJ+mDDgKY38nFPHHEHxXcM83h9nRIqHeyIa8Dg3mYR72Y64MeCL QnmoYxCGZeB1sZPG1iahQ1bamI57YQSfisc5FlRWKVN0FlIXdPXu3bfA/tRPHpmbiwtg QSgw== X-Gm-Message-State: AKaTC02y8hMSCNXzEo+toxI0Q/N+WW/BrmmvoJZGuAJTBjyIoUtn+sqHZ4RnGR7r5YO4LiMg X-Received: by 10.194.2.110 with SMTP id 14mr9395681wjt.206.1479737093376; Mon, 21 Nov 2016 06:04:53 -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.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Nov 2016 06:04:52 -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 2/2] clk: qcom: clk-rpm: Fix clk_hw_onecell_data references Date: Mon, 21 Nov 2016 16:04:50 +0200 Message-Id: <20161121140450.12353-2-georgi.djakov@linaro.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161121140450.12353-1-georgi.djakov@linaro.org> References: <20161121140450.12353-1-georgi.djakov@linaro.org> 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 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-rpm.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 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-rpm.c b/drivers/clk/qcom/clk-rpm.c index 1950a9572624..5dbed3b1546a 100644 --- a/drivers/clk/qcom/clk-rpm.c +++ b/drivers/clk/qcom/clk-rpm.c @@ -127,8 +127,7 @@ struct clk_rpm { 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_clk_desc { @@ -393,9 +392,7 @@ MODULE_DEVICE_TABLE(of, rpm_clk_match_table); 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 +412,13 @@ 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->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_clks[i]) @@ -437,17 +433,19 @@ 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); + rcc->data->hws[i] = ERR_PTR(-ENOENT); continue; } ret = devm_clk_hw_register(&pdev->dev, &rpm_clks[i]->hw); if (ret) goto err; + + rcc->data->hws[i] = &rpm_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;