projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'asoc/fix/max98095' into asoc-linus
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
hwmon
/
ina2xx.c
diff --git
a/drivers/hwmon/ina2xx.c
b/drivers/hwmon/ina2xx.c
index 18c062360ca7950e77ef4573ddf3dbc9fc16be82..70a39a8ac0160e520f6017225c71d1efedebca2c 100644
(file)
--- a/
drivers/hwmon/ina2xx.c
+++ b/
drivers/hwmon/ina2xx.c
@@
-233,8
+233,7
@@
static int ina2xx_probe(struct i2c_client *client,
return -ENOMEM;
if (dev_get_platdata(&client->dev)) {
return -ENOMEM;
if (dev_get_platdata(&client->dev)) {
- pdata =
- (struct ina2xx_platform_data *)dev_get_platdata(&client->dev);
+ pdata = dev_get_platdata(&client->dev);
shunt = pdata->shunt_uohms;
} else if (!of_property_read_u32(client->dev.of_node,
"shunt-resistor", &val)) {
shunt = pdata->shunt_uohms;
} else if (!of_property_read_u32(client->dev.of_node,
"shunt-resistor", &val)) {