|
@@ -333,12 +333,12 @@ set_temp(1);
|
|
|
set_temp(2);
|
|
|
|
|
|
static ssize_t
|
|
|
-show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
|
|
|
+alarms_show(struct device *dev, struct device_attribute *attr, char *buf)
|
|
|
{
|
|
|
struct adm1025_data *data = adm1025_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)
|
|
@@ -358,21 +358,21 @@ static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 4);
|
|
|
static SENSOR_DEVICE_ATTR(temp1_fault, S_IRUGO, show_alarm, NULL, 14);
|
|
|
|
|
|
static ssize_t
|
|
|
-show_vid(struct device *dev, struct device_attribute *attr, char *buf)
|
|
|
+cpu0_vid_show(struct device *dev, struct device_attribute *attr, char *buf)
|
|
|
{
|
|
|
struct adm1025_data *data = adm1025_update_device(dev);
|
|
|
return sprintf(buf, "%u\n", vid_from_reg(data->vid, data->vrm));
|
|
|
}
|
|
|
-static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
|
|
|
+static DEVICE_ATTR_RO(cpu0_vid);
|
|
|
|
|
|
static ssize_t
|
|
|
-show_vrm(struct device *dev, struct device_attribute *attr, char *buf)
|
|
|
+vrm_show(struct device *dev, struct device_attribute *attr, char *buf)
|
|
|
{
|
|
|
struct adm1025_data *data = dev_get_drvdata(dev);
|
|
|
return sprintf(buf, "%u\n", data->vrm);
|
|
|
}
|
|
|
-static ssize_t set_vrm(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 adm1025_data *data = dev_get_drvdata(dev);
|
|
|
unsigned long val;
|
|
@@ -388,7 +388,7 @@ static ssize_t set_vrm(struct device *dev, struct device_attribute *attr,
|
|
|
data->vrm = val;
|
|
|
return count;
|
|
|
}
|
|
|
-static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm);
|
|
|
+static DEVICE_ATTR_RW(vrm);
|
|
|
|
|
|
/*
|
|
|
* Real code
|