From: Stefan Agner Date: Wed, 29 Jun 2016 05:53:21 +0000 (-0700) Subject: mfd: rn5t618: Register power off callback optionally X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=fd65ae4cb65a9e41af44e37318afb39045d86bf2;p=deliverable%2Flinux.git mfd: rn5t618: Register power off callback optionally Only register power off if the PMIC is defined as system power controller (see Documentation/devicetree/bindings/power/ power-controller.txt). Signed-off-by: Stefan Agner Reviewed-by: Marcel Ziswiler Signed-off-by: Lee Jones --- diff --git a/drivers/mfd/rn5t618.c b/drivers/mfd/rn5t618.c index c86160d3a773..1831740d9016 100644 --- a/drivers/mfd/rn5t618.c +++ b/drivers/mfd/rn5t618.c @@ -102,9 +102,13 @@ static int rn5t618_i2c_probe(struct i2c_client *i2c, return ret; } - if (!pm_power_off) { - rn5t618_pm_power_off = priv; - pm_power_off = rn5t618_power_off; + if (of_device_is_system_power_controller(i2c->dev.of_node)) { + if (!pm_power_off) { + rn5t618_pm_power_off = priv; + pm_power_off = rn5t618_power_off; + } else { + dev_warn(&i2c->dev, "Poweroff callback already assigned\n"); + } } return 0;