|
@@ -103,16 +103,16 @@ show_in_channel(1);
|
|
|
show_in_channel(2);
|
|
|
show_in_channel(3);
|
|
|
|
|
|
-static ssize_t show_out0_ouput(struct device *dev,
|
|
|
- struct device_attribute *attr, char *buf)
|
|
|
+static ssize_t out0_output_show(struct device *dev,
|
|
|
+ struct device_attribute *attr, char *buf)
|
|
|
{
|
|
|
struct pcf8591_data *data = i2c_get_clientdata(to_i2c_client(dev));
|
|
|
return sprintf(buf, "%d\n", data->aout * 10);
|
|
|
}
|
|
|
|
|
|
-static ssize_t set_out0_output(struct device *dev,
|
|
|
- struct device_attribute *attr,
|
|
|
- const char *buf, size_t count)
|
|
|
+static ssize_t out0_output_store(struct device *dev,
|
|
|
+ struct device_attribute *attr,
|
|
|
+ const char *buf, size_t count)
|
|
|
{
|
|
|
unsigned long val;
|
|
|
struct i2c_client *client = to_i2c_client(dev);
|
|
@@ -132,19 +132,18 @@ static ssize_t set_out0_output(struct device *dev,
|
|
|
return count;
|
|
|
}
|
|
|
|
|
|
-static DEVICE_ATTR(out0_output, S_IWUSR | S_IRUGO,
|
|
|
- show_out0_ouput, set_out0_output);
|
|
|
+static DEVICE_ATTR_RW(out0_output);
|
|
|
|
|
|
-static ssize_t show_out0_enable(struct device *dev,
|
|
|
+static ssize_t out0_enable_show(struct device *dev,
|
|
|
struct device_attribute *attr, char *buf)
|
|
|
{
|
|
|
struct pcf8591_data *data = i2c_get_clientdata(to_i2c_client(dev));
|
|
|
return sprintf(buf, "%u\n", !(!(data->control & PCF8591_CONTROL_AOEF)));
|
|
|
}
|
|
|
|
|
|
-static ssize_t set_out0_enable(struct device *dev,
|
|
|
- struct device_attribute *attr,
|
|
|
- const char *buf, size_t count)
|
|
|
+static ssize_t out0_enable_store(struct device *dev,
|
|
|
+ struct device_attribute *attr,
|
|
|
+ const char *buf, size_t count)
|
|
|
{
|
|
|
struct i2c_client *client = to_i2c_client(dev);
|
|
|
struct pcf8591_data *data = i2c_get_clientdata(client);
|
|
@@ -165,8 +164,7 @@ static ssize_t set_out0_enable(struct device *dev,
|
|
|
return count;
|
|
|
}
|
|
|
|
|
|
-static DEVICE_ATTR(out0_enable, S_IWUSR | S_IRUGO,
|
|
|
- show_out0_enable, set_out0_enable);
|
|
|
+static DEVICE_ATTR_RW(out0_enable);
|
|
|
|
|
|
static struct attribute *pcf8591_attributes[] = {
|
|
|
&dev_attr_out0_enable.attr,
|