Messages in this thread | | | Date | Mon, 23 Jan 2017 11:32:01 +0000 | From | Lee Jones <> | Subject | Re: [PATCH 1/4] mfd: max77686: Don't attempt to get i2c_device_id .data |
| |
On Thu, 12 Jan 2017, Javier Martinez Canillas wrote:
> The driver is only used in platforms that have DT support so always the > I2C device .data will be get from the matched OF node and never will be > from the I2C device ID table. > > Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> > --- > > drivers/mfd/max77686.c | 13 +++++-------- > 1 file changed, 5 insertions(+), 8 deletions(-)
Applied, thanks.
> diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c > index 7b68ed72e9cb..ddae3bf3e46c 100644 > --- a/drivers/mfd/max77686.c > +++ b/drivers/mfd/max77686.c > @@ -188,14 +188,11 @@ static int max77686_i2c_probe(struct i2c_client *i2c, > if (!max77686) > return -ENOMEM; > > - if (i2c->dev.of_node) { > - match = of_match_node(max77686_pmic_dt_match, i2c->dev.of_node); > - if (!match) > - return -EINVAL; > - > - max77686->type = (unsigned long)match->data; > - } else > - max77686->type = id->driver_data; > + match = of_match_node(max77686_pmic_dt_match, i2c->dev.of_node); > + if (!match) > + return -EINVAL; > + > + max77686->type = (unsigned long)match->data; > > i2c_set_clientdata(i2c, max77686); > max77686->dev = &i2c->dev;
-- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
| |