Commit ef8040b3 authored by Michael Abbott's avatar Michael Abbott Committed by James Toy

Layout patch to fix earlier adm1021.c patch

Signed-off-by: default avatarMichael Abbott <michael.abbott@diamond.ac.uk>
Cc: Jean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent a7d6a600
...@@ -214,22 +214,22 @@ static ssize_t set_temp_min(struct device *dev, ...@@ -214,22 +214,22 @@ static ssize_t set_temp_min(struct device *dev,
return count; return count;
} }
static ssize_t show_low_power( static ssize_t show_low_power(struct device *dev,
struct device *dev, struct device_attribute *devattr, char *buf) struct device_attribute *devattr, char *buf)
{ {
struct adm1021_data *data = adm1021_update_device(dev); struct adm1021_data *data = adm1021_update_device(dev);
return sprintf(buf, "%d\n", data->low_power); return sprintf(buf, "%d\n", data->low_power);
} }
static ssize_t set_low_power( static ssize_t set_low_power(struct device *dev,
struct device *dev, struct device_attribute *devattr, struct device_attribute *devattr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct adm1021_data *data = i2c_get_clientdata(client); struct adm1021_data *data = i2c_get_clientdata(client);
int low_power = simple_strtol(buf, NULL, 10) != 0; int low_power = simple_strtol(buf, NULL, 10) != 0;
mutex_lock(&data->update_lock);
mutex_lock(&data->update_lock);
if (low_power != data->low_power) { if (low_power != data->low_power) {
int config = i2c_smbus_read_byte_data( int config = i2c_smbus_read_byte_data(
client, ADM1021_REG_CONFIG_R); client, ADM1021_REG_CONFIG_R);
...@@ -260,8 +260,7 @@ static SENSOR_DEVICE_ATTR(temp2_min_alarm, S_IRUGO, show_alarm, NULL, 3); ...@@ -260,8 +260,7 @@ static SENSOR_DEVICE_ATTR(temp2_min_alarm, S_IRUGO, show_alarm, NULL, 3);
static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, 2); static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, 2);
static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL); static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
static DEVICE_ATTR( static DEVICE_ATTR(low_power, S_IWUSR | S_IRUGO, show_low_power, set_low_power);
low_power, S_IWUSR | S_IRUGO, show_low_power, set_low_power);
static struct attribute *adm1021_attributes[] = { static struct attribute *adm1021_attributes[] = {
&sensor_dev_attr_temp1_max.dev_attr.attr, &sensor_dev_attr_temp1_max.dev_attr.attr,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment