From mboxrd@z Thu Jan 1 00:00:00 1970 From: lee.jones@linaro.org (Lee Jones) Date: Thu, 16 Jun 2016 15:59:08 +0100 Subject: [PATCH v2 4/5] mfd: rn5t618: register power off callback optionally In-Reply-To: <20160608010429.19618-5-stefan@agner.ch> References: <20160608010429.19618-1-stefan@agner.ch> <20160608010429.19618-5-stefan@agner.ch> Message-ID: <20160616145907.GD4948@dell> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, 07 Jun 2016, Stefan Agner wrote: > Only register power off if the PMIC is defined as system power > controller (see Documentation/devicetree/bindings/power/ > power-controller.txt). > > Reviewed-by: Marcel Ziswiler > Signed-off-by: Stefan Agner These should be chronological. > --- > drivers/mfd/rn5t618.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/mfd/rn5t618.c b/drivers/mfd/rn5t618.c > index 7607ced..d9b4d40 100644 > --- a/drivers/mfd/rn5t618.c > +++ b/drivers/mfd/rn5t618.c > @@ -103,9 +103,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_err(&i2c->dev, "Failed to set poweroff capability, already defined\n"); This is not an error. Please use dev_warn() instead. Also, is this message actually accurate? Your commit message would indicate that it's not. > + } > } > > return 0; -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog