Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44646c19 authored by Jim Cromie's avatar Jim Cromie Committed by Greg Kroah-Hartman
Browse files

pc87360: Move some code around 



pc87360: Move some code around

Moves code for get-set-decl tuples for 3 items: cpu0_vid, vrm, alarms_in
up, to just after the get-set-decl tuple for voltages.
These items are already 'activated' together with the rest of the 
voltage attributes, so the move tightens the grouping that's made
explicit in next patch.

Signed-off-by: default avatarJim Cromie <jim.cromie@gmail.com>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c1685f61

drivers/hwmon/pc87360.c

+28 −28
Original line number Diff line number Diff line
@@ -472,6 +472,34 @@ static struct sensor_device_attribute in_max[] = { 
	SENSOR_ATTR(in10_max, S_IWUSR | S_IRUGO, show_in_max, set_in_max, 10),

};



static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct pc87360_data *data = pc87360_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 ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct pc87360_data *data = pc87360_update_device(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)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct pc87360_data *data = i2c_get_clientdata(client);

	data->vrm = simple_strtoul(buf, NULL, 10);

	return count;

}

static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm);



static ssize_t show_in_alarms(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct pc87360_data *data = pc87360_update_device(dev);

	return sprintf(buf, "%u\n", data->in_alarms);

}

static DEVICE_ATTR(alarms_in, S_IRUGO, show_in_alarms, NULL);



static ssize_t show_therm_input(struct device *dev, struct device_attribute *devattr, char *buf)

{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
@@ -590,34 +618,6 @@ static struct sensor_device_attribute therm_crit[] = { 
		    show_therm_crit, set_therm_crit, 2+11),

};



static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct pc87360_data *data = pc87360_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 ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct pc87360_data *data = pc87360_update_device(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)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct pc87360_data *data = i2c_get_clientdata(client);

	data->vrm = simple_strtoul(buf, NULL, 10);

	return count;

}

static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm);



static ssize_t show_in_alarms(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct pc87360_data *data = pc87360_update_device(dev);

	return sprintf(buf, "%u\n", data->in_alarms);

}

static DEVICE_ATTR(alarms_in, S_IRUGO, show_in_alarms, NULL);



static ssize_t show_temp_input(struct device *dev, struct device_attribute *devattr, char *buf)

{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);