|
@@ -400,23 +400,23 @@ show_temp_index(2)
|
|
|
show_temp_index(3)
|
|
|
|
|
|
/* 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 smsc47m192_data *data = smsc47m192_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);
|
|
|
|
|
|
-static ssize_t show_vrm(struct device *dev, struct device_attribute *attr,
|
|
|
+static ssize_t vrm_show(struct device *dev, struct device_attribute *attr,
|
|
|
char *buf)
|
|
|
{
|
|
|
struct smsc47m192_data *data = dev_get_drvdata(dev);
|
|
|
return sprintf(buf, "%d\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 smsc47m192_data *data = dev_get_drvdata(dev);
|
|
|
unsigned long val;
|
|
@@ -431,7 +431,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);
|
|
|
|
|
|
/* Alarms */
|
|
|
static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,
|