|
@@ -575,26 +575,30 @@ static ssize_t show_in_0(struct w83627hf_data *data, char *buf, u8 reg)
|
|
|
return sprintf(buf,"%ld\n", in0);
|
|
|
}
|
|
|
|
|
|
-static ssize_t show_regs_in_0(struct device *dev, struct device_attribute *attr, char *buf)
|
|
|
+static ssize_t in0_input_show(struct device *dev,
|
|
|
+ struct device_attribute *attr, char *buf)
|
|
|
{
|
|
|
struct w83627hf_data *data = w83627hf_update_device(dev);
|
|
|
return show_in_0(data, buf, data->in[0]);
|
|
|
}
|
|
|
|
|
|
-static ssize_t show_regs_in_min0(struct device *dev, struct device_attribute *attr, char *buf)
|
|
|
+static ssize_t in0_min_show(struct device *dev, struct device_attribute *attr,
|
|
|
+ char *buf)
|
|
|
{
|
|
|
struct w83627hf_data *data = w83627hf_update_device(dev);
|
|
|
return show_in_0(data, buf, data->in_min[0]);
|
|
|
}
|
|
|
|
|
|
-static ssize_t show_regs_in_max0(struct device *dev, struct device_attribute *attr, char *buf)
|
|
|
+static ssize_t in0_max_show(struct device *dev, struct device_attribute *attr,
|
|
|
+ char *buf)
|
|
|
{
|
|
|
struct w83627hf_data *data = w83627hf_update_device(dev);
|
|
|
return show_in_0(data, buf, data->in_max[0]);
|
|
|
}
|
|
|
|
|
|
-static ssize_t store_regs_in_min0(struct device *dev, struct device_attribute *attr,
|
|
|
- const char *buf, size_t count)
|
|
|
+static ssize_t in0_min_store(struct device *dev,
|
|
|
+ struct device_attribute *attr, const char *buf,
|
|
|
+ size_t count)
|
|
|
{
|
|
|
struct w83627hf_data *data = dev_get_drvdata(dev);
|
|
|
unsigned long val;
|
|
@@ -622,8 +626,9 @@ static ssize_t store_regs_in_min0(struct device *dev, struct device_attribute *a
|
|
|
return count;
|
|
|
}
|
|
|
|
|
|
-static ssize_t store_regs_in_max0(struct device *dev, struct device_attribute *attr,
|
|
|
- const char *buf, size_t count)
|
|
|
+static ssize_t in0_max_store(struct device *dev,
|
|
|
+ struct device_attribute *attr, const char *buf,
|
|
|
+ size_t count)
|
|
|
{
|
|
|
struct w83627hf_data *data = dev_get_drvdata(dev);
|
|
|
unsigned long val;
|
|
@@ -651,11 +656,9 @@ static ssize_t store_regs_in_max0(struct device *dev, struct device_attribute *a
|
|
|
return count;
|
|
|
}
|
|
|
|
|
|
-static DEVICE_ATTR(in0_input, S_IRUGO, show_regs_in_0, NULL);
|
|
|
-static DEVICE_ATTR(in0_min, S_IRUGO | S_IWUSR,
|
|
|
- show_regs_in_min0, store_regs_in_min0);
|
|
|
-static DEVICE_ATTR(in0_max, S_IRUGO | S_IWUSR,
|
|
|
- show_regs_in_max0, store_regs_in_max0);
|
|
|
+static DEVICE_ATTR_RO(in0_input);
|
|
|
+static DEVICE_ATTR_RW(in0_min);
|
|
|
+static DEVICE_ATTR_RW(in0_max);
|
|
|
|
|
|
static ssize_t
|
|
|
show_fan_input(struct device *dev, struct device_attribute *devattr, char *buf)
|
|
@@ -796,21 +799,22 @@ sysfs_temp_decl(2);
|
|
|
sysfs_temp_decl(3);
|
|
|
|
|
|
static ssize_t
|
|
|
-show_vid_reg(struct device *dev, struct device_attribute *attr, char *buf)
|
|
|
+cpu0_vid_show(struct device *dev, struct device_attribute *attr, char *buf)
|
|
|
{
|
|
|
struct w83627hf_data *data = w83627hf_update_device(dev);
|
|
|
return sprintf(buf, "%ld\n", (long) 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)
|
|
|
+vrm_show(struct device *dev, struct device_attribute *attr, char *buf)
|
|
|
{
|
|
|
struct w83627hf_data *data = dev_get_drvdata(dev);
|
|
|
return sprintf(buf, "%ld\n", (long) data->vrm);
|
|
|
}
|
|
|
static ssize_t
|
|
|
-store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
|
|
|
+vrm_store(struct device *dev, struct device_attribute *attr, const char *buf,
|
|
|
+ size_t count)
|
|
|
{
|
|
|
struct w83627hf_data *data = dev_get_drvdata(dev);
|
|
|
unsigned long val;
|
|
@@ -826,15 +830,15 @@ store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf
|
|
|
|
|
|
return count;
|
|
|
}
|
|
|
-static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm_reg, store_vrm_reg);
|
|
|
+static DEVICE_ATTR_RW(vrm);
|
|
|
|
|
|
static ssize_t
|
|
|
-show_alarms_reg(struct device *dev, struct device_attribute *attr, char *buf)
|
|
|
+alarms_show(struct device *dev, struct device_attribute *attr, char *buf)
|
|
|
{
|
|
|
struct w83627hf_data *data = w83627hf_update_device(dev);
|
|
|
return sprintf(buf, "%ld\n", (long) data->alarms);
|
|
|
}
|
|
|
-static DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL);
|
|
|
+static DEVICE_ATTR_RO(alarms);
|
|
|
|
|
|
static ssize_t
|
|
|
show_alarm(struct device *dev, struct device_attribute *attr, char *buf)
|
|
@@ -860,7 +864,7 @@ static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 5);
|
|
|
static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 13);
|
|
|
|
|
|
static ssize_t
|
|
|
-show_beep_mask(struct device *dev, struct device_attribute *attr, char *buf)
|
|
|
+beep_mask_show(struct device *dev, struct device_attribute *attr, char *buf)
|
|
|
{
|
|
|
struct w83627hf_data *data = w83627hf_update_device(dev);
|
|
|
return sprintf(buf, "%ld\n",
|
|
@@ -868,7 +872,7 @@ show_beep_mask(struct device *dev, struct device_attribute *attr, char *buf)
|
|
|
}
|
|
|
|
|
|
static ssize_t
|
|
|
-store_beep_mask(struct device *dev, struct device_attribute *attr,
|
|
|
+beep_mask_store(struct device *dev, struct device_attribute *attr,
|
|
|
const char *buf, size_t count)
|
|
|
{
|
|
|
struct w83627hf_data *data = dev_get_drvdata(dev);
|
|
@@ -895,8 +899,7 @@ store_beep_mask(struct device *dev, struct device_attribute *attr,
|
|
|
return count;
|
|
|
}
|
|
|
|
|
|
-static DEVICE_ATTR(beep_mask, S_IRUGO | S_IWUSR,
|
|
|
- show_beep_mask, store_beep_mask);
|
|
|
+static DEVICE_ATTR_RW(beep_mask);
|
|
|
|
|
|
static ssize_t
|
|
|
show_beep(struct device *dev, struct device_attribute *attr, char *buf)
|
|
@@ -1264,13 +1267,13 @@ sysfs_temp_type(2);
|
|
|
sysfs_temp_type(3);
|
|
|
|
|
|
static ssize_t
|
|
|
-show_name(struct device *dev, struct device_attribute *devattr, char *buf)
|
|
|
+name_show(struct device *dev, struct device_attribute *devattr, char *buf)
|
|
|
{
|
|
|
struct w83627hf_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 int __init w83627hf_find(int sioaddr, unsigned short *addr,
|
|
|
struct w83627hf_sio_data *sio_data)
|