]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
mfd: rk8xx-core: Check "system-power-controller" first
authorDragan Simic <dsimic@manjaro.org>
Tue, 8 Oct 2024 14:30:10 +0000 (16:30 +0200)
committerLee Jones <lee@kernel.org>
Wed, 16 Oct 2024 08:04:11 +0000 (09:04 +0100)
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

Signed-off-by: Dragan Simic <dsimic@manjaro.org>
Link: https://lore.kernel.org/r/08d4e88974c205eba124086ce156622e2e4cdc20.1728397516.git.dsimic@manjaro.org
Signed-off-by: Lee Jones <lee@kernel.org>
drivers/mfd/rk8xx-core.c

index c95de65c2f124a466eecb0d7f2c3d6360033e58e..71c2b80a4678d627e86cfbec8135f08e262559d3 100644 (file)
@@ -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);