|
@@ -262,8 +262,8 @@ static struct adm9240_data *adm9240_update_device(struct device *dev)
|
|
|
/*** sysfs accessors ***/
|
|
|
|
|
|
/* temperature */
|
|
|
-static ssize_t show_temp(struct device *dev, struct device_attribute *dummy,
|
|
|
- char *buf)
|
|
|
+static ssize_t temp1_input_show(struct device *dev,
|
|
|
+ struct device_attribute *dummy, char *buf)
|
|
|
{
|
|
|
struct adm9240_data *data = adm9240_update_device(dev);
|
|
|
return sprintf(buf, "%d\n", data->temp / 128 * 500); /* 9-bit value */
|
|
@@ -298,7 +298,7 @@ static ssize_t set_max(struct device *dev, struct device_attribute *devattr,
|
|
|
return count;
|
|
|
}
|
|
|
|
|
|
-static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL);
|
|
|
+static DEVICE_ATTR_RO(temp1_input);
|
|
|
static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO,
|
|
|
show_max, set_max, 0);
|
|
|
static SENSOR_DEVICE_ATTR(temp1_max_hyst, S_IWUSR | S_IRUGO,
|
|
@@ -501,13 +501,13 @@ fan(1);
|
|
|
fan(2);
|
|
|
|
|
|
/* alarms */
|
|
|
-static ssize_t show_alarms(struct device *dev,
|
|
|
+static ssize_t alarms_show(struct device *dev,
|
|
|
struct device_attribute *attr, char *buf)
|
|
|
{
|
|
|
struct adm9240_data *data = adm9240_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)
|
|
@@ -527,25 +527,25 @@ static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 6);
|
|
|
static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 7);
|
|
|
|
|
|
/* vid */
|
|
|
-static ssize_t show_vid(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 adm9240_data *data = adm9240_update_device(dev);
|
|
|
return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm));
|
|
|
}
|
|
|
-static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
|
|
|
+static DEVICE_ATTR_RO(cpu0_vid);
|
|
|
|
|
|
/* analog output */
|
|
|
-static ssize_t show_aout(struct device *dev,
|
|
|
- struct device_attribute *attr, char *buf)
|
|
|
+static ssize_t aout_output_show(struct device *dev,
|
|
|
+ struct device_attribute *attr, char *buf)
|
|
|
{
|
|
|
struct adm9240_data *data = adm9240_update_device(dev);
|
|
|
return sprintf(buf, "%d\n", AOUT_FROM_REG(data->aout));
|
|
|
}
|
|
|
|
|
|
-static ssize_t set_aout(struct device *dev,
|
|
|
- struct device_attribute *attr,
|
|
|
- const char *buf, size_t count)
|
|
|
+static ssize_t aout_output_store(struct device *dev,
|
|
|
+ struct device_attribute *attr,
|
|
|
+ const char *buf, size_t count)
|
|
|
{
|
|
|
struct adm9240_data *data = dev_get_drvdata(dev);
|
|
|
struct i2c_client *client = data->client;
|
|
@@ -562,7 +562,7 @@ static ssize_t set_aout(struct device *dev,
|
|
|
mutex_unlock(&data->update_lock);
|
|
|
return count;
|
|
|
}
|
|
|
-static DEVICE_ATTR(aout_output, S_IRUGO | S_IWUSR, show_aout, set_aout);
|
|
|
+static DEVICE_ATTR_RW(aout_output);
|
|
|
|
|
|
static ssize_t chassis_clear(struct device *dev,
|
|
|
struct device_attribute *attr,
|