linux-imx
Public
Source
committed fa75f745e3485
85
86
86
return attr->mode;87
87
}88
88
89
89
struct vexpress_hwmon_type {90
90
const char *name;91
91
const struct attribute_group **attr_groups;92
92
};93
93
94
94
#if !defined(CONFIG_REGULATOR_VEXPRESS)95
-
static DEVICE_ATTR(in1_label, S_IRUGO, vexpress_hwmon_label_show, NULL);96
-
static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, vexpress_hwmon_u32_show,97
-
NULL, 1000);95
+
static DEVICE_ATTR(in1_label, 0444, vexpress_hwmon_label_show, NULL);96
+
static SENSOR_DEVICE_ATTR_RO(in1_input, vexpress_hwmon_u32, 1000);98
97
static struct attribute *vexpress_hwmon_attrs_volt[] = {99
98
&dev_attr_in1_label.attr,100
99
&sensor_dev_attr_in1_input.dev_attr.attr,101
100
NULL102
101
};103
102
static struct attribute_group vexpress_hwmon_group_volt = {104
103
.is_visible = vexpress_hwmon_attr_is_visible,105
104
.attrs = vexpress_hwmon_attrs_volt,106
105
};107
106
static struct vexpress_hwmon_type vexpress_hwmon_volt = {108
107
.name = "vexpress_volt",109
108
.attr_groups = (const struct attribute_group *[]) {110
109
&vexpress_hwmon_group_volt,111
110
NULL,112
111
},113
112
};114
113
#endif115
114
116
-
static DEVICE_ATTR(curr1_label, S_IRUGO, vexpress_hwmon_label_show, NULL);117
-
static SENSOR_DEVICE_ATTR(curr1_input, S_IRUGO, vexpress_hwmon_u32_show,118
-
NULL, 1000);115
+
static DEVICE_ATTR(curr1_label, 0444, vexpress_hwmon_label_show, NULL);116
+
static SENSOR_DEVICE_ATTR_RO(curr1_input, vexpress_hwmon_u32, 1000);119
117
static struct attribute *vexpress_hwmon_attrs_amp[] = {120
118
&dev_attr_curr1_label.attr,121
119
&sensor_dev_attr_curr1_input.dev_attr.attr,122
120
NULL123
121
};124
122
static struct attribute_group vexpress_hwmon_group_amp = {125
123
.is_visible = vexpress_hwmon_attr_is_visible,126
124
.attrs = vexpress_hwmon_attrs_amp,127
125
};128
126
static struct vexpress_hwmon_type vexpress_hwmon_amp = {129
127
.name = "vexpress_amp",130
128
.attr_groups = (const struct attribute_group *[]) {131
129
&vexpress_hwmon_group_amp,132
130
NULL133
131
},134
132
};135
133
136
-
static DEVICE_ATTR(temp1_label, S_IRUGO, vexpress_hwmon_label_show, NULL);137
-
static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, vexpress_hwmon_u32_show,138
-
NULL, 1000);134
+
static DEVICE_ATTR(temp1_label, 0444, vexpress_hwmon_label_show, NULL);135
+
static SENSOR_DEVICE_ATTR_RO(temp1_input, vexpress_hwmon_u32, 1000);139
136
static struct attribute *vexpress_hwmon_attrs_temp[] = {140
137
&dev_attr_temp1_label.attr,141
138
&sensor_dev_attr_temp1_input.dev_attr.attr,142
139
NULL143
140
};144
141
static struct attribute_group vexpress_hwmon_group_temp = {145
142
.is_visible = vexpress_hwmon_attr_is_visible,146
143
.attrs = vexpress_hwmon_attrs_temp,147
144
};148
145
static struct vexpress_hwmon_type vexpress_hwmon_temp = {149
146
.name = "vexpress_temp",150
147
.attr_groups = (const struct attribute_group *[]) {151
148
&vexpress_hwmon_group_temp,152
149
NULL153
150
},154
151
};155
152
156
-
static DEVICE_ATTR(power1_label, S_IRUGO, vexpress_hwmon_label_show, NULL);157
-
static SENSOR_DEVICE_ATTR(power1_input, S_IRUGO, vexpress_hwmon_u32_show,158
-
NULL, 1);153
+
static DEVICE_ATTR(power1_label, 0444, vexpress_hwmon_label_show, NULL);154
+
static SENSOR_DEVICE_ATTR_RO(power1_input, vexpress_hwmon_u32, 1);159
155
static struct attribute *vexpress_hwmon_attrs_power[] = {160
156
&dev_attr_power1_label.attr,161
157
&sensor_dev_attr_power1_input.dev_attr.attr,162
158
NULL163
159
};164
160
static struct attribute_group vexpress_hwmon_group_power = {165
161
.is_visible = vexpress_hwmon_attr_is_visible,166
162
.attrs = vexpress_hwmon_attrs_power,167
163
};168
164
static struct vexpress_hwmon_type vexpress_hwmon_power = {169
165
.name = "vexpress_power",170
166
.attr_groups = (const struct attribute_group *[]) {171
167
&vexpress_hwmon_group_power,172
168
NULL173
169
},174
170
};175
171
176
-
static DEVICE_ATTR(energy1_label, S_IRUGO, vexpress_hwmon_label_show, NULL);177
-
static SENSOR_DEVICE_ATTR(energy1_input, S_IRUGO, vexpress_hwmon_u64_show,178
-
NULL, 1);172
+
static DEVICE_ATTR(energy1_label, 0444, vexpress_hwmon_label_show, NULL);173
+
static SENSOR_DEVICE_ATTR_RO(energy1_input, vexpress_hwmon_u64, 1);179
174
static struct attribute *vexpress_hwmon_attrs_energy[] = {180
175
&dev_attr_energy1_label.attr,181
176
&sensor_dev_attr_energy1_input.dev_attr.attr,182
177
NULL183
178
};184
179
static struct attribute_group vexpress_hwmon_group_energy = {185
180
.is_visible = vexpress_hwmon_attr_is_visible,186
181
.attrs = vexpress_hwmon_attrs_energy,187
182
};188
183
static struct vexpress_hwmon_type vexpress_hwmon_energy = {