From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH master] soc: rockchip: io-domain: handle missing supply correctly
Date: Mon, 15 Apr 2024 07:31:30 +0200 [thread overview]
Message-ID: <20240415053130.368278-1-a.fatoum@pengutronix.de> (raw)
The original Linux code calls regulator_get_optional and handles its
-ENODEV return code, which morphed into regulator_get when ported to
barebox. The error handling stayed as-is leading to causing supplies to
trigger errors instead of being silently ignored.
As we use NULL to describe the dummy regulator in barebox, we can add a
trivial regulator_get_optional implementation and use it to fix the
I/O domain driver.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
drivers/soc/rockchip/io-domain.c | 2 +-
include/regulator.h | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/soc/rockchip/io-domain.c b/drivers/soc/rockchip/io-domain.c
index 9f60b6eb4c28..453d393cb09f 100644
--- a/drivers/soc/rockchip/io-domain.c
+++ b/drivers/soc/rockchip/io-domain.c
@@ -165,7 +165,7 @@ static int rockchip_iodomain_probe(struct device *dev)
if (!supply_name)
continue;
- reg = regulator_get(dev, supply_name);
+ reg = regulator_get_optional(dev, supply_name);
if (IS_ERR(reg)) {
ret = PTR_ERR(reg);
diff --git a/include/regulator.h b/include/regulator.h
index 135fe6d91fd3..305da0d774ba 100644
--- a/include/regulator.h
+++ b/include/regulator.h
@@ -3,6 +3,7 @@
#define __REGULATOR_H
#include <linux/bitops.h>
+#include <linux/err.h>
struct device;
@@ -284,4 +285,11 @@ static inline int regulator_get_voltage(struct regulator *regulator)
#endif
+static inline struct regulator *regulator_get_optional(struct device *dev,
+ const char *id)
+{
+ return regulator_get(dev, id) ?: ERR_PTR(-ENODEV);
+}
+
+
#endif /* __REGULATOR_H */
--
2.39.2
next reply other threads:[~2024-04-15 5:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-15 5:31 Ahmad Fatoum [this message]
2024-04-16 10:26 ` 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=20240415053130.368278-1-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.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