Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
hwmon: (ltc4215) make sysfs file match the alarm cause
+2
-2
+2
-2
drivers/hwmon/ltc4215.c
+2
-2
drivers/hwmon/ltc4215.c
···
205
205
206
206
/* Power (virtual) */
207
207
LTC4215_POWER(power1_input);
208
-
LTC4215_ALARM(power1_alarm, (1 << 3), LTC4215_STATUS);
209
208
210
209
/* Input Voltage */
211
210
LTC4215_VOLTAGE(in1_input, LTC4215_ADIN);
···
213
214
214
215
/* Output Voltage */
215
216
LTC4215_VOLTAGE(in2_input, LTC4215_SOURCE);
217
+
LTC4215_ALARM(in2_min_alarm, (1 << 3), LTC4215_STATUS);
216
218
217
219
/* Finally, construct an array of pointers to members of the above objects,
218
220
* as required for sysfs_create_group()
···
223
223
&sensor_dev_attr_curr1_max_alarm.dev_attr.attr,
224
224
225
225
&sensor_dev_attr_power1_input.dev_attr.attr,
226
-
&sensor_dev_attr_power1_alarm.dev_attr.attr,
227
226
228
227
&sensor_dev_attr_in1_input.dev_attr.attr,
229
228
&sensor_dev_attr_in1_max_alarm.dev_attr.attr,
230
229
&sensor_dev_attr_in1_min_alarm.dev_attr.attr,
231
230
232
231
&sensor_dev_attr_in2_input.dev_attr.attr,
232
+
&sensor_dev_attr_in2_min_alarm.dev_attr.attr,
233
233
234
234
NULL,
235
235
};