linux-pm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: linux-rockchip@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
	Heiko Stuebner <heiko@sntech.de>,
	Kyungmin Park <kyungmin.park@samsung.com>,
	MyungJoo Ham <myungjoo.ham@samsung.com>,
	Will Deacon <will@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	kernel@pengutronix.de,
	Michael Riesch <michael.riesch@wolfvision.net>,
	Robin Murphy <robin.murphy@arm.com>,
	Vincent Legoll <vincent.legoll@gmail.com>,
	Rob Herring <robh+dt@kernel.org>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
	Conor Dooley <conor+dt@kernel.org>,
	devicetree@vger.kernel.org,
	Sebastian Reichel <sebastian.reichel@collabora.com>,
	Sascha Hauer <s.hauer@pengutronix.de>
Subject: [PATCH v6 01/26] PM / devfreq: rockchip-dfi: Make pmu regmap mandatory
Date: Fri, 16 Jun 2023 08:20:36 +0200	[thread overview]
Message-ID: <20230616062101.601837-2-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20230616062101.601837-1-s.hauer@pengutronix.de>

As a matter of fact the regmap_pmu already is mandatory because
it is used unconditionally in the driver. Bail out gracefully in
probe() rather than crashing later.

Fixes: b9d1262bca0af ("PM / devfreq: event: support rockchip dfi controller")
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Link: https://lore.kernel.org/r/20230524083153.2046084-2-s.hauer@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---

Notes:
    Changes since v4:
    - move to beginning of the series to make it easier to backport to stable
    - Add a Fixes: tag
    - add missing of_node_put()

 drivers/devfreq/event/rockchip-dfi.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c
index 39ac069cabc75..74893c06aa087 100644
--- a/drivers/devfreq/event/rockchip-dfi.c
+++ b/drivers/devfreq/event/rockchip-dfi.c
@@ -193,14 +193,15 @@ static int rockchip_dfi_probe(struct platform_device *pdev)
 		return dev_err_probe(dev, PTR_ERR(data->clk),
 				     "Cannot get the clk pclk_ddr_mon\n");
 
-	/* try to find the optional reference to the pmu syscon */
 	node = of_parse_phandle(np, "rockchip,pmu", 0);
-	if (node) {
-		data->regmap_pmu = syscon_node_to_regmap(node);
-		of_node_put(node);
-		if (IS_ERR(data->regmap_pmu))
-			return PTR_ERR(data->regmap_pmu);
-	}
+	if (!node)
+		return dev_err_probe(&pdev->dev, -ENODEV, "Can't find pmu_grf registers\n");
+
+	data->regmap_pmu = syscon_node_to_regmap(node);
+	of_node_put(node);
+	if (IS_ERR(data->regmap_pmu))
+		return PTR_ERR(data->regmap_pmu);
+
 	data->dev = dev;
 
 	desc = devm_kzalloc(dev, sizeof(*desc), GFP_KERNEL);
-- 
2.39.2


  reply	other threads:[~2023-06-16  6:22 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-16  6:20 [PATCH v6 00/26] Add perf support to the rockchip-dfi driver Sascha Hauer
2023-06-16  6:20 ` Sascha Hauer [this message]
2023-06-16  6:20 ` [PATCH v6 02/26] PM / devfreq: rockchip-dfi: Embed desc into private data struct Sascha Hauer
2023-06-16  6:20 ` [PATCH v6 03/26] PM / devfreq: rockchip-dfi: use consistent name for " Sascha Hauer
2023-06-16  6:20 ` [PATCH v6 04/26] PM / devfreq: rockchip-dfi: Add SoC specific init function Sascha Hauer
2023-06-16  6:20 ` [PATCH v6 05/26] PM / devfreq: rockchip-dfi: dfi store raw values in counter struct Sascha Hauer
2023-06-16  6:20 ` [PATCH v6 06/26] PM / devfreq: rockchip-dfi: Use free running counter Sascha Hauer
2023-06-16  6:20 ` [PATCH v6 07/26] PM / devfreq: rockchip-dfi: introduce channel mask Sascha Hauer
2023-06-16  6:20 ` [PATCH v6 08/26] PM / devfreq: rk3399_dmc,dfi: generalize DDRTYPE defines Sascha Hauer
2023-06-16  6:20 ` [PATCH v6 09/26] PM / devfreq: rockchip-dfi: Clean up DDR type register defines Sascha Hauer
2023-06-16  6:20 ` [PATCH v6 10/26] PM / devfreq: rockchip-dfi: Add RK3568 support Sascha Hauer
2023-06-16  6:20 ` [PATCH v6 11/26] PM / devfreq: rockchip-dfi: Handle LPDDR2 correctly Sascha Hauer
2023-06-16  6:20 ` [PATCH v6 12/26] PM / devfreq: rockchip-dfi: Handle LPDDR4X Sascha Hauer
2023-06-16  6:20 ` [PATCH v6 13/26] PM / devfreq: rockchip-dfi: Pass private data struct to internal functions Sascha Hauer
2023-06-16  6:20 ` [PATCH v6 14/26] PM / devfreq: rockchip-dfi: Prepare for multiple users Sascha Hauer
2023-06-16  6:20 ` [PATCH v6 15/26] PM / devfreq: rockchip-dfi: give variable a better name Sascha Hauer
2023-06-16  6:20 ` [PATCH v6 16/26] PM / devfreq: rockchip-dfi: Add perf support Sascha Hauer
2023-06-16  6:20 ` [PATCH v6 17/26] PM / devfreq: rockchip-dfi: make register stride SoC specific Sascha Hauer
2023-06-16  6:20 ` [PATCH v6 18/26] PM / devfreq: rockchip-dfi: account for multiple DDRMON_CTRL registers Sascha Hauer
2023-06-16  6:20 ` [PATCH v6 19/26] PM / devfreq: rockchip-dfi: add support for RK3588 Sascha Hauer
2023-06-16  6:20 ` [PATCH v6 20/26] dt-bindings: devfreq: event: convert Rockchip DFI binding to yaml Sascha Hauer
2023-06-16  6:20 ` [PATCH v6 21/26] dt-bindings: devfreq: event: rockchip,dfi: Add rk3568 support Sascha Hauer
2023-06-16  6:20 ` [PATCH v6 22/26] dt-bindings: devfreq: event: rockchip,dfi: Add rk3588 support Sascha Hauer
2023-06-16 19:05   ` Conor Dooley
2023-06-21  7:41     ` Sascha Hauer
2023-06-21 16:12       ` Conor Dooley
2023-06-16  6:20 ` [PATCH v6 23/26] dt-bindings: soc: rockchip: grf: add rockchip,rk3588-pmugrf Sascha Hauer
2023-06-16 19:01   ` Conor Dooley
2023-06-16  6:20 ` [PATCH v6 24/26] arm64: dts: rockchip: rk3399: Enable DFI Sascha Hauer
2023-06-16  6:21 ` [PATCH v6 25/26] arm64: dts: rockchip: rk356x: Add DFI Sascha Hauer
2023-06-16  6:21 ` [PATCH v6 26/26] arm64: dts: rockchip: rk3588s: " Sascha Hauer
2023-06-16 13:50 ` [PATCH v6 00/26] Add perf support to the rockchip-dfi driver Vincent Legoll
2023-06-21  7:09   ` Sascha Hauer
     [not found] ` <CAGTfZH1An5ZYXkskY2vPvNFB=7tAzzGR1shf4_AG5jzsWAgu-w@mail.gmail.com>
2023-10-10  5:58   ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230616062101.601837-2-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=heiko@sntech.de \
    --cc=kernel@pengutronix.de \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=kyungmin.park@samsung.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=mark.rutland@arm.com \
    --cc=michael.riesch@wolfvision.net \
    --cc=myungjoo.ham@samsung.com \
    --cc=robh+dt@kernel.org \
    --cc=robin.murphy@arm.com \
    --cc=sebastian.reichel@collabora.com \
    --cc=vincent.legoll@gmail.com \
    --cc=will@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).