[PATCH] mfd: rk8xx-core: Check "system-power-controller" first

[PATCH] mfd: rk8xx-core: Check "system-power-controller" first

[Dragan Simic]

Commit 961748bb1555 ("dt-bindings: mfd: rk8xx: Deprecate rockchip,system-
power-controller") made the property "rockchip,system-power-controller"
deprecated in favor of the shorter, universal form "system-power-controller".
Following the updates to the board dts files, [1] make the favored property
name checked first, to save a few CPU cycles.

[1] https://lore.kernel.org/linux-rockchip/20241008105450.20648-1-didi.debian@cknow.org/T/#u

Cc: Diederik de Haas <didi.debian@cknow.org>
Signed-off-by: Dragan Simic <dsimic@manjaro.org>
---
 drivers/mfd/rk8xx-core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c
index 39ab114ea669..ed892bddf7b5 100644
--- a/drivers/mfd/rk8xx-core.c
+++ b/drivers/mfd/rk8xx-core.c
@@ -785,8 +785,8 @@ int rk8xx_probe(struct device *dev, int variant, unsigned int irq, struct regmap
 	if (ret)
 		return dev_err_probe(dev, ret, "failed to add MFD devices\n");
 
-	if (device_property_read_bool(dev, "rockchip,system-power-controller") ||
-	    device_property_read_bool(dev, "system-power-controller")) {
+	if (device_property_read_bool(dev, "system-power-controller") ||
+	    device_property_read_bool(dev, "rockchip,system-power-controller")) {
 		ret = devm_register_sys_off_handler(dev,
 				    SYS_OFF_MODE_POWER_OFF_PREPARE, SYS_OFF_PRIO_HIGH,
 				    &rk808_power_off, rk808);

Re: (subset) [PATCH] mfd: rk8xx-core: Check "system-power-controller" first

[Lee Jones]

On Tue, 08 Oct 2024 16:30:10 +0200, Dragan Simic wrote:
> Commit 961748bb1555 ("dt-bindings: mfd: rk8xx: Deprecate rockchip,system-
> power-controller") made the property "rockchip,system-power-controller"
> deprecated in favor of the shorter, universal form "system-power-controller".
> Following the updates to the board dts files, [1] make the favored property
> name checked first, to save a few CPU cycles.
> 
> [1] https://lore.kernel.org/linux-rockchip/20241008105450.20648-1-didi.debian@cknow.org/T/#u
> 
> [...]

Applied, thanks!

[1/1] mfd: rk8xx-core: Check "system-power-controller" first
      commit: ebced0587bacdce9a69adbc289ec1c35c1c6b85c

--
Lee Jones [李琼斯]