| Message ID | 1404505467-26526-5-git-send-email-javier.martinez@collabora.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 04 Jul 2014, Javier Martinez Canillas wrote: > The function max77802_i2c_parse_dt_pdata() should only be called > if there isn't already platform data for the device. > > Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> > --- > drivers/mfd/max77686.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) I assume some of these patches can be applied independently. Let me know which ones and I'll apply them. In the mean time: Acked-by: Lee Jones <lee.jones@linaro.org>
Hello Lee, On 07/09/2014 04:52 PM, Lee Jones wrote: > On Fri, 04 Jul 2014, Javier Martinez Canillas wrote: > >> The function max77802_i2c_parse_dt_pdata() should only be called >> if there isn't already platform data for the device. >> >> Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> >> --- >> drivers/mfd/max77686.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > I assume some of these patches can be applied independently. > Yes, some patches can be applied independently and it would be quite helpful indeed since that will allow me to keep a smaller series :) > Let me know which ones and I'll apply them. In the mean time: > > Acked-by: Lee Jones <lee.jones@linaro.org> > Patches 1-7 are just cleanups and improvements for max77686 mfd driver so they can be applied safely. You had already acked 1-6 and 7 is just a trivial patch so I guess you won't have issues with that one as well. Patches 11 and 14 are small patches for the max77802 clk driver and Mike already gave his Reviewed-by tag so if you are going to take the whole set through your tree those two patches are safe to be applied as well. Thanks a lot for your help and best regards, Javier
On Fri, 04 Jul 2014, Javier Martinez Canillas wrote: > The function max77802_i2c_parse_dt_pdata() should only be called > if there isn't already platform data for the device. > > Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> > --- > drivers/mfd/max77686.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied now, thanks. > diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c > index d1f9d04..12d4c17 100644 > --- a/drivers/mfd/max77686.c > +++ b/drivers/mfd/max77686.c > @@ -124,7 +124,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c, > unsigned int data; > int ret = 0; > > - if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) > + if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node && !pdata) > pdata = max77686_i2c_parse_dt_pdata(&i2c->dev); > > if (!pdata) {
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c index d1f9d04..12d4c17 100644 --- a/drivers/mfd/max77686.c +++ b/drivers/mfd/max77686.c @@ -124,7 +124,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c, unsigned int data; int ret = 0; - if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) + if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node && !pdata) pdata = max77686_i2c_parse_dt_pdata(&i2c->dev); if (!pdata) {
The function max77802_i2c_parse_dt_pdata() should only be called if there isn't already platform data for the device. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> --- drivers/mfd/max77686.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)