Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42d3b83f authored by Jim Cromie's avatar Jim Cromie Committed by Greg Kroah-Hartman
Browse files

[PATCH] hwmon: Allow sensor attributes arrays 



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: default avatarJim Cromie <jim.cromie@gmail.com>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b0e6e962

include/linux/hwmon-sysfs.h

+7 −5
Original line number Diff line number Diff line
@@ -27,11 +27,13 @@ struct sensor_device_attribute{ 
#define to_sensor_dev_attr(_dev_attr) \

	container_of(_dev_attr, struct sensor_device_attribute, dev_attr)



#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 = {	\

	.dev_attr =	__ATTR(_name,_mode,_show,_store),	\

	.index =	_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;