diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-11 07:03:54 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-11 07:03:54 +0400 |
| commit | 516f7b3f2a7dbe93d3075e76a06bbfcd0c0ee4f7 (patch) | |
| tree | 37ce4bba8424450a83fec5d5aa1c78ee463aeadc | |
| parent | 442e0973e9273ae8832abd70f52efde8b8326178 (diff) | |
| parent | 8876dd78d9f0cd317d55dc19e5cd17194af15b52 (diff) | |
| download | linux-516f7b3f2a7dbe93d3075e76a06bbfcd0c0ee4f7.tar.xz | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon cleanups from Guenter Roeck:
"Minor cleanup in ina2xx and hwmon-vid drivers; no functional changes"
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (ina2xx) Remove casting the return value which is a void pointer
hwmon: (hwmon-vid) Add __maybe_unused attribute to dummy variable
| -rw-r--r-- | drivers/hwmon/hwmon-vid.c | 2 | ||||
| -rw-r--r-- | drivers/hwmon/ina2xx.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c index 89cfd64b3373..ef91b8a67549 100644 --- a/drivers/hwmon/hwmon-vid.c +++ b/drivers/hwmon/hwmon-vid.c @@ -246,7 +246,7 @@ static struct vrm_model vrm_models[] = { */ static u8 get_via_model_d_vrm(void) { - unsigned int vid, brand, dummy; + unsigned int vid, brand, __maybe_unused dummy; static const char *brands[4] = { "C7-M", "C7", "Eden", "C7-D" }; diff --git a/drivers/hwmon/ina2xx.c b/drivers/hwmon/ina2xx.c index 18c062360ca7..70a39a8ac016 100644 --- 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)) { - 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)) { |