1 files changed, 14 insertions, 10 deletions

diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
index 7eb4004b3601..a90c09d331c1 100644
--- a/include/linux/hwmon-sysfs.h
+++ b/include/linux/hwmon-sysfs.h
@@ -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_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;
@@ -41,11 +43,13 @@ struct sensor_device_attribute_2 {
 #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 */