From: Dragan Simic Date: Tue, 8 Oct 2024 14:30:10 +0000 (+0200) Subject: mfd: rk8xx-core: Check "system-power-controller" first X-Git-Tag: v6.13-rc1~113^2~36 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=337dd40b3bac67acfd74e4d8b2d9d4886e0d0aeb;p=linux-block.git mfd: rk8xx-core: Check "system-power-controller" first 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 Link: https://lore.kernel.org/r/08d4e88974c205eba124086ce156622e2e4cdc20.1728397516.git.dsimic@manjaro.org Signed-off-by: Lee Jones --- diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c index c95de65c2f12..71c2b80a4678 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);