|
@@ -1041,14 +1041,14 @@ static struct sensor_device_attribute sda_temp_alarm[] = {
|
|
|
};
|
|
|
|
|
|
/* get realtime status of all sensors items: voltage, temp, fan */
|
|
|
-static ssize_t show_alarms_reg(struct device *dev,
|
|
|
- struct device_attribute *attr, char *buf)
|
|
|
+static ssize_t alarms_show(struct device *dev, struct device_attribute *attr,
|
|
|
+ char *buf)
|
|
|
{
|
|
|
struct w83791d_data *data = w83791d_update_device(dev);
|
|
|
return sprintf(buf, "%u\n", data->alarms);
|
|
|
}
|
|
|
|
|
|
-static DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL);
|
|
|
+static DEVICE_ATTR_RO(alarms);
|
|
|
|
|
|
/* Beep control */
|
|
|
|
|
@@ -1147,25 +1147,24 @@ static struct sensor_device_attribute sda_beep_ctrl[] = {
|
|
|
};
|
|
|
|
|
|
/* cpu voltage regulation information */
|
|
|
-static ssize_t show_vid_reg(struct device *dev,
|
|
|
- struct device_attribute *attr, char *buf)
|
|
|
+static ssize_t cpu0_vid_show(struct device *dev,
|
|
|
+ struct device_attribute *attr, char *buf)
|
|
|
{
|
|
|
struct w83791d_data *data = w83791d_update_device(dev);
|
|
|
return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm));
|
|
|
}
|
|
|
|
|
|
-static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
|
|
|
+static DEVICE_ATTR_RO(cpu0_vid);
|
|
|
|
|
|
-static ssize_t show_vrm_reg(struct device *dev,
|
|
|
- struct device_attribute *attr, char *buf)
|
|
|
+static ssize_t vrm_show(struct device *dev, struct device_attribute *attr,
|
|
|
+ char *buf)
|
|
|
{
|
|
|
struct w83791d_data *data = dev_get_drvdata(dev);
|
|
|
return sprintf(buf, "%d\n", data->vrm);
|
|
|
}
|
|
|
|
|
|
-static ssize_t store_vrm_reg(struct device *dev,
|
|
|
- struct device_attribute *attr,
|
|
|
- const char *buf, size_t count)
|
|
|
+static ssize_t vrm_store(struct device *dev, struct device_attribute *attr,
|
|
|
+ const char *buf, size_t count)
|
|
|
{
|
|
|
struct w83791d_data *data = dev_get_drvdata(dev);
|
|
|
unsigned long val;
|
|
@@ -1188,7 +1187,7 @@ static ssize_t store_vrm_reg(struct device *dev,
|
|
|
return count;
|
|
|
}
|
|
|
|
|
|
-static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);
|
|
|
+static DEVICE_ATTR_RW(vrm);
|
|
|
|
|
|
#define IN_UNIT_ATTRS(X) \
|
|
|
&sda_in_input[X].dev_attr.attr, \
|