devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: linux-pm@vger.kernel.org
Cc: linux-rockchip@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
	Rob Herring <robh+dt@kernel.org>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.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>,
	Sascha Hauer <s.hauer@pengutronix.de>
Subject: [PATCH v3 03/19] PM / devfreq: rockchip-dfi: Make pmu regmap mandatory
Date: Thu, 16 Feb 2023 11:36:08 +0100	[thread overview]
Message-ID: <20230216103624.591901-4-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20230216103624.591901-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.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/devfreq/event/rockchip-dfi.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c
index 98712ac68aa5f..47cc9e48dafab 100644
--- a/drivers/devfreq/event/rockchip-dfi.c
+++ b/drivers/devfreq/event/rockchip-dfi.c
@@ -193,14 +193,14 @@ static int rockchip_dfi_probe(struct platform_device *pdev)
 		return dev_err_probe(dev, PTR_ERR(dfi->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) {
-		dfi->regmap_pmu = syscon_node_to_regmap(node);
-		of_node_put(node);
-		if (IS_ERR(dfi->regmap_pmu))
-			return PTR_ERR(dfi->regmap_pmu);
-	}
+	if (!node)
+		return dev_err_probe(&pdev->dev, -ENODEV, "Can't find pmu_grf registers\n");
+
+	dfi->regmap_pmu = syscon_node_to_regmap(node);
+	if (IS_ERR(dfi->regmap_pmu))
+		return PTR_ERR(dfi->regmap_pmu);
+
 	dfi->dev = dev;
 
 	desc = &dfi->desc;
-- 
2.30.2


  parent reply	other threads:[~2023-02-16 10:37 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-16 10:36 [PATCH v3 00/19] Add perf support to the rockchip-dfi driver Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 01/19] PM / devfreq: rockchip-dfi: Embed desc into private data struct Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 02/19] PM / devfreq: rockchip-dfi: use consistent name for " Sascha Hauer
2023-02-16 10:36 ` Sascha Hauer [this message]
2023-02-16 10:36 ` [PATCH v3 04/19] PM / devfreq: rockchip-dfi: Add SoC specific init function Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 05/19] PM / devfreq: rockchip-dfi: dfi store raw values in counter struct Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 06/19] PM / devfreq: rockchip-dfi: Use free running counter Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 07/19] PM / devfreq: rockchip-dfi: introduce channel mask Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 08/19] PM / devfreq: rk3399_dmc,dfi: generalize DDRTYPE defines Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 09/19] PM / devfreq: rockchip-dfi: Clean up DDR type register defines Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 10/19] PM / devfreq: rockchip-dfi: Add RK3568 support Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 11/19] PM / devfreq: rockchip-dfi: Handle LPDDR2 correctly Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 12/19] PM / devfreq: rockchip-dfi: Handle LPDDR4X Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 13/19] PM / devfreq: rockchip-dfi: Pass private data struct to internal functions Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 14/19] PM / devfreq: rockchip-dfi: Prepare for multiple users Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 15/19] PM / devfreq: rockchip-dfi: Add perf support Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 16/19] arm64: dts: rockchip: rk3399: Enable DFI Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 17/19] arm64: dts: rockchip: rk356x: Add DFI Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 18/19] dt-bindings: devfreq: event: convert Rockchip DFI binding to yaml Sascha Hauer
2023-02-16 10:36 ` [PATCH v3 19/19] dt-bindings: devfreq: event: rockchip,dfi: Add rk3568 support Sascha Hauer
2023-03-06 13:25 ` [PATCH v3 00/19] Add perf support to the rockchip-dfi driver 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=20230216103624.591901-4-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --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-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=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).