summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-12 14:44:34 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-12 14:44:34 +0900
commit7e238a2ecd117e16b154e1b0ed77906596600ff5 (patch)
tree37a1fc3d15ba9873f16efb21556f619fbea4b492 /include
parent66a173b926891023e34e78cb32f4681d19777e01 (diff)
parent26336c8a36c0a6a28b9ecf6f1bb8c8f5605d6a21 (diff)
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck: "Introduce new hwmon API functions hwmon_device_register_with_groups and devm_hwmon_device_register_with_groups, and convert several drivers to use the new API. Add support for EMC1404, EMC1424, LTC2977, LTC2978A, LM25063 to existing drivers Various cleanups in several drivers" * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (49 commits) hwmon: (w83793) Clean up a signedness issue hwmon: (nct6775) Remove an unused variable hwmon: (emc1403) Add support for EMC1404 and EMC1424 hwmon: (emc1403) Convert to use devm_hwmon_device_register_with_groups hwmon: (pmbus/ltc2978): Add support for LTC2978A hwmon: (pmbus/ltc2978): Add support for LTC2977 hwmon: (pmbus/lm25066) Add support for LM25063 hwmon: Correct some typos hwmon: (gpio-fan) Include linux/of.h header hwmon: (lm70) Remove redundant spi_set_drvdata hwmon: (adcxx) Remove redundant spi_set_drvdata hwmon: (jc42) fix coccinelle warnings hwmon: (ltc4261) fix coccinelle warnings hwmon: (lm95234) fix coccinelle warnings hwmon: (max6697) fix coccinelle warnings hwmon: (max6642 fix coccinelle warnings hwmon: (ds1621) fix coccinelle warnings hwmon: (nct6775) fix coccinelle warnings hwmon: (jc42) Convert to use devm_hwmon_device_register_with_groups hwmon: (ltc4261) Convert to use devm_hwmon_device_register_with_groups ...
Diffstat (limited to 'include')
-rw-r--r--include/linux/hwmon-vid.h2
-rw-r--r--include/linux/hwmon.h10
2 files changed, 11 insertions, 1 deletions
diff --git a/include/linux/hwmon-vid.h b/include/linux/hwmon-vid.h
index f346e4d5381c..da0a680e2f6d 100644
--- a/include/linux/hwmon-vid.h
+++ b/include/linux/hwmon-vid.h
@@ -38,7 +38,7 @@ static inline int vid_to_reg(int val, u8 vrm)
return ((val >= 1100) && (val <= 1850) ?
((18499 - val * 10) / 25 + 5) / 10 : -1);
default:
- return -1;
+ return -EINVAL;
}
}
diff --git a/include/linux/hwmon.h b/include/linux/hwmon.h
index b2514f70d591..09354f6c1d63 100644
--- a/include/linux/hwmon.h
+++ b/include/linux/hwmon.h
@@ -15,9 +15,19 @@
#define _HWMON_H_
struct device;
+struct attribute_group;
struct device *hwmon_device_register(struct device *dev);
+struct device *
+hwmon_device_register_with_groups(struct device *dev, const char *name,
+ void *drvdata,
+ const struct attribute_group **groups);
+struct device *
+devm_hwmon_device_register_with_groups(struct device *dev, const char *name,
+ void *drvdata,
+ const struct attribute_group **groups);
void hwmon_device_unregister(struct device *dev);
+void devm_hwmon_device_unregister(struct device *dev);
#endif