Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-20 01:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup in ina2xx and hwmon-vid drivers; no functional changes

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJSL19cAAoJEMsfJm/On5mBT8cP/3hrslWwlhmOfdCUtR81Di4i
 uA77DM3KA61mlv45l1jZucFUzavKrQMwTnbL80yM7Ugk1NvmApQlCRkrqbUK2M7n
 KQJzTRTqX719m6/FYePk0hSFRZKZaDC5+e1vup3Truxc9r2Yo968l6wnCe6X7SG/
 A/btKP0vee0cmm8mJGdksMaL1LcV/N5bhKA5TEcZSHIz0HGJd0j7lYYTD5t88Ba2
 /NocXIT+oR8n+ai0ys0ep10HIW1DRaUjdJjw3ow1K7JueW1MnSocezRZPxx+ItKz
 dmmDdMIm3EO7OeanxdHMr+l2SLjH8+9qyq/i1kxp/5/4bK3LpUthsAwtTdVX/nSR
 c7wWxSNP1gIgpfDujxp1v/dmjUUKn9WtDtZgAq6Fc9ltO8DPD0g3aT9cWyqPlMpM
 1rPiZdxRTD24Fy+8YgmxfAZLqQNhJ/CYgQb0dvclUBfEzAn4dFRzLIURN1ajgz2k
 QQaFezmJgOVsP9Jq0xD7Cq+mx+SWmUEPQf/X8VoQeCNoPnlkyNnvYjjbLhC7hkwI
 0Uts/pFEgUUhVqlUwXVzVlivlAbYS3iKnhk50PuVUqbGfWWpmzn4+IPUW1E9PtSK
 ghR650SUrqB2hw+1UY61WnK9YKcwvtTFP7x6gowN5uZUE3uxg+rSZ+kv+V6QQan8
 S2GJdQVifKfszuOCmUtS
 =Kw30
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2013-09-10 20:03:54 -07:00
commit 516f7b3f2a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/hwmon/hwmon-vid.c
View File

@ -246,7 +246,7 @@ static struct vrm_model vrm_models[] = {
*/ */
static u8 get_via_model_d_vrm(void) 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] = { static const char *brands[4] = {
"C7-M", "C7", "Eden", "C7-D" "C7-M", "C7", "Eden", "C7-D"
}; };

3
drivers/hwmon/ina2xx.c
View File

@ -233,8 +233,7 @@ static int ina2xx_probe(struct i2c_client *client,
return -ENOMEM; return -ENOMEM;
if (dev_get_platdata(&client->dev)) { if (dev_get_platdata(&client->dev)) {
pdata = pdata = dev_get_platdata(&client->dev);
(struct ina2xx_platform_data *)dev_get_platdata(&client->dev);
shunt = pdata->shunt_uohms; shunt = pdata->shunt_uohms;
} else if (!of_property_read_u32(client->dev.of_node, } else if (!of_property_read_u32(client->dev.of_node,
"shunt-resistor", &val)) { "shunt-resistor", &val)) {