diff options
| author | Javier Martinez Canillas <javier@osg.samsung.com> | 2017-01-13 10:34:05 -0300 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2017-02-13 09:29:43 +0000 |
| commit | 17ee971f03ad2c0786842d3a6b551e842459e2ac (patch) | |
| tree | a8132c25030d5c2a72863401dacd857a06dfad99 | |
| parent | 7e9c40c63933a643908d686bd89dfc2315e8c70a (diff) | |
| download | linux-17ee971f03ad2c0786842d3a6b551e842459e2ac.tar.gz linux-17ee971f03ad2c0786842d3a6b551e842459e2ac.tar.bz2 linux-17ee971f03ad2c0786842d3a6b551e842459e2ac.zip | |
mfd: max77686: Don't attempt to get i2c_device_id .data
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>
Acked-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Tested-by: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
| -rw-r--r-- | drivers/mfd/max77686.c | 13 |
1 files changed, 5 insertions, 8 deletions
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; |