|
@@ -580,14 +580,14 @@ show_fan_offset(1);
|
|
|
show_fan_offset(2);
|
|
|
|
|
|
/* Alarms */
|
|
|
-static ssize_t show_alarms(struct device *dev, struct device_attribute *attr,
|
|
|
+static ssize_t alarms_show(struct device *dev, struct device_attribute *attr,
|
|
|
char *buf)
|
|
|
{
|
|
|
struct via686a_data *data = via686a_update_device(dev);
|
|
|
return sprintf(buf, "%u\n", data->alarms);
|
|
|
}
|
|
|
|
|
|
-static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
|
|
|
+static DEVICE_ATTR_RO(alarms);
|
|
|
|
|
|
static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,
|
|
|
char *buf)
|
|
@@ -607,13 +607,13 @@ static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 15);
|
|
|
static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 6);
|
|
|
static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 7);
|
|
|
|
|
|
-static ssize_t show_name(struct device *dev, struct device_attribute
|
|
|
+static ssize_t name_show(struct device *dev, struct device_attribute
|
|
|
*devattr, char *buf)
|
|
|
{
|
|
|
struct via686a_data *data = dev_get_drvdata(dev);
|
|
|
return sprintf(buf, "%s\n", data->name);
|
|
|
}
|
|
|
-static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
|
|
|
+static DEVICE_ATTR_RO(name);
|
|
|
|
|
|
static struct attribute *via686a_attributes[] = {
|
|
|
&sensor_dev_attr_in0_input.dev_attr.attr,
|