rework hwmon-sysfs refactoring
PATCH 18/23 rework hwmon-sysfs refactoring
refactor SENSOR_DEVICE_ATTR* macros into separate macros, for declaration-initialization and for initialization-expression. 2 part construct is better for array-initialization.
With this change, the 23 part patchset works for 13-rc4-mm1
$ diffstat ../hwmon-sysfs-patch hwmon-sysfs.h | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-)
Signed-off-by Jim Cromie <[email protected]>
-------------- next part --------------
linux/hwmon-sysfs.h renamed from linux/hwmon-sysfs.h.orig +14 -6
@@ -27,12 +27,16 @@#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), \ +#define __SENSOR_DEVICE_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_DEVICE_ATTR(_name,_mode,_show,_store,_index) + +struct sensor_device_attribute_2 {struct device_attribute dev_attr;u8 index;
@@ -41,11 +45,15 @@#define to_sensor_dev_attr_2 (_dev_attr) \ container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr) -#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), \ +#define __SENSOR_DEVICE_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 \ + = __SENSOR_DEVICE_ATTR_2(_name,_mode,_show,_store,_nr,_index) + +#endif /* _LINUX_HWMON_SYSFS_H */