hwmon: Allow sensor attribute arrays

Hi Jim,

Some times ago, you proposed a change to include/linux/hwmon-sysfs.h that would have made it easier to declare arrays of struct sensor_device_attribute. Back then we gave it up because other important changes to the pc87360 driver (which was your first target for that patch) needed to be done first, but I think it is now the right time to think of that patch again.

I have made some cosmetic cleanups to it, and here it is again. I need it for a driver of mine. Could you please confirm you're still OK with it, and maybe propose a patch for the pc87360 driver?

The size benefit when converting my own driver to use arrays of attributes is pretty impressive (from 12.0 kB down to 9.4kB in memory). The pc87360 driver should benefit at least as much and probably even more (in absolute amount of spared memory).

Thanks.

* * * * *

This patch refactors SENSOR_DEVICE_ATTR macro. First it creates a new macro SENSOR_ATTR() which expands to an initialization expression, then it uses that in SENSOR_DEVICE_ATTR, which declares and initializes a struct sensor_device_attribute.

IOW, SENSOR_ATTR() imitates __ATTR() in include/linux/device.h.

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

@@ -27,11 +27,13 @@
 #define to_sensor_dev_attr(_dev_attr) \
 	container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
 
-#define SENSOR_DEVICE_ATTR(_name,_mode,_show,_store,_index)	\
-struct sensor_device_attribute sensor_dev_attr_##_name = {	\
-	.dev_attr =	__ATTR(_name,_mode,_show,_store),	\
-	.index =	_index,					\
-}
+#define SENSOR_ATTR(_name, _mode, _show, _store, _index)	\
+	{ .dev_attr = __ATTR(_name, _mode, _show, _store),	\
+	  .index = _index }
+
+#define SENSOR_DEVICE_ATTR(_name, _mode, _show, _store, _index)	\
+struct sensor_device_attribute sensor_dev_attr_##_name		\
+	= SENSOR_ATTR(_name, _mode, _show, _store, _index)
 
 struct sensor_device_attribute_2 {
 	struct device_attribute dev_attr;