Skip to contentSkip to conversation

hwmon: Refactor SENSOR_DEVICE_ATTR_2

PATCH New Jean Delvare 1 participant 1 message Jan 18, 2006 Hardware monitoring

lore
Share & tools
lore
#0 lore raw

PATCH 9/17 hwmon: Refactor SENSOR_DEVICE_ATTR_2

From: Jim Cromie <jim.cromie at gmail.com>
Content-Disposition: inline; filename=hwmon-sensor-attr-array-2.patch

This patch refactors SENSOR_DEVICE_ATTR_2 macro, following pattern set by SENSOR_ATTR. First it creates a new macro SENSOR_ATTR_2() which expands to an initialization expression, then it uses that in SENSOR_DEVICE_ATTR_2, which declares and initializes a struct sensor_device_attribute_2.

Signed-off-by Jim Cromie <jim.cromie at gmail.com>
Signed-off-by Jean Delvare <khali at linux-fr.org>
---
 include/linux/hwmon-sysfs.h |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
include/linux/hwmon-sysfs.h +7 -5
@@ -43,11 +43,13 @@
 #define to_sensor_dev_attr_2(_dev_attr) \
 	container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
 
+#define SENSOR_ATTR_2(_name, _mode, _show, _store, _nr, _index)	\
+	{ .dev_attr = __ATTR(_name, _mode, _show, _store),	\
+	  .index = _index,					\
+	  .nr = _nr }
+
 #define SENSOR_DEVICE_ATTR_2(_name,_mode,_show,_store,_nr,_index)	\
-struct sensor_device_attribute_2 sensor_dev_attr_##_name = {	\
-	.dev_attr =	__ATTR(_name,_mode,_show,_store),	\
-	.index =	_index,					\
-	.nr =		_nr,					\
-}
+struct sensor_device_attribute_2 sensor_dev_attr_##_name		\
+	= SENSOR_ATTR_2(_name, _mode, _show, _store, _nr, _index)
 
 #endif /* _LINUX_HWMON_SYSFS_H */
Signature · 1 line
Jean Delvare