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

Commit 4cd0183d authored by Julia Lawall's avatar Julia Lawall Committed by Guenter Roeck
Browse files

hwmon: (emc2103) use permission-specific DEVICE_ATTR variants 



Use DEVICE_ATTR_RO for read only attributes and DEVICE_ATTR_RW for
read/write attributes. This simplifies the source code, improves
readbility, and reduces the chance of inconsistencies.

The conversion was done automatically using coccinelle. It was validated
by compiling both the old and the new source code and comparing its text,
data, and bss size.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
[groeck: Updated description]
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 14c05198

drivers/hwmon/emc2103.c

+18 −18
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *da, 
}



static ssize_t

show_fan(struct device *dev, struct device_attribute *da, char *buf)

fan1_input_show(struct device *dev, struct device_attribute *da, char *buf)

{

	struct emc2103_data *data = emc2103_update_device(dev);

	int rpm = 0;
@@ -294,7 +294,7 @@ show_fan(struct device *dev, struct device_attribute *da, char *buf) 
}



static ssize_t

show_fan_div(struct device *dev, struct device_attribute *da, char *buf)

fan1_div_show(struct device *dev, struct device_attribute *da, char *buf)

{

	struct emc2103_data *data = emc2103_update_device(dev);

	int fan_div = 8 / data->fan_multiplier;
@@ -307,7 +307,7 @@ show_fan_div(struct device *dev, struct device_attribute *da, char *buf) 
 * of least surprise; the user doesn't expect the fan target to change just

 * because the divider changed.

 */

static ssize_t set_fan_div(struct device *dev, struct device_attribute *da,

static ssize_t fan1_div_store(struct device *dev, struct device_attribute *da,

			      const char *buf, size_t count)

{

	struct emc2103_data *data = emc2103_update_device(dev);
@@ -369,7 +369,7 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *da, 
}



static ssize_t

show_fan_target(struct device *dev, struct device_attribute *da, char *buf)

fan1_target_show(struct device *dev, struct device_attribute *da, char *buf)

{

	struct emc2103_data *data = emc2103_update_device(dev);

	int rpm = 0;
@@ -382,8 +382,9 @@ show_fan_target(struct device *dev, struct device_attribute *da, char *buf) 
	return sprintf(buf, "%d\n", rpm);

}



static ssize_t set_fan_target(struct device *dev, struct device_attribute *da,

			      const char *buf, size_t count)

static ssize_t fan1_target_store(struct device *dev,

				 struct device_attribute *da, const char *buf,

				 size_t count)

{

	struct emc2103_data *data = emc2103_update_device(dev);

	struct i2c_client *client = data->client;
@@ -412,7 +413,7 @@ static ssize_t set_fan_target(struct device *dev, struct device_attribute *da, 
}



static ssize_t

show_fan_fault(struct device *dev, struct device_attribute *da, char *buf)

fan1_fault_show(struct device *dev, struct device_attribute *da, char *buf)

{

	struct emc2103_data *data = emc2103_update_device(dev);

	bool fault = ((data->fan_tach & 0x1fe0) == 0x1fe0);
@@ -420,14 +421,15 @@ show_fan_fault(struct device *dev, struct device_attribute *da, char *buf) 
}



static ssize_t

show_pwm_enable(struct device *dev, struct device_attribute *da, char *buf)

pwm1_enable_show(struct device *dev, struct device_attribute *da, char *buf)

{

	struct emc2103_data *data = emc2103_update_device(dev);

	return sprintf(buf, "%d\n", data->fan_rpm_control ? 3 : 0);

}



static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *da,

			      const char *buf, size_t count)

static ssize_t pwm1_enable_store(struct device *dev,

				 struct device_attribute *da, const char *buf,

				 size_t count)

{

	struct emc2103_data *data = dev_get_drvdata(dev);

	struct i2c_client *client = data->client;
@@ -512,14 +514,12 @@ static SENSOR_DEVICE_ATTR(temp4_min_alarm, S_IRUGO, show_temp_min_alarm, 
static SENSOR_DEVICE_ATTR(temp4_max_alarm, S_IRUGO, show_temp_max_alarm,

	NULL, 3);



static DEVICE_ATTR(fan1_input, S_IRUGO, show_fan, NULL);

static DEVICE_ATTR(fan1_div, S_IRUGO | S_IWUSR, show_fan_div, set_fan_div);

static DEVICE_ATTR(fan1_target, S_IRUGO | S_IWUSR, show_fan_target,

	set_fan_target);

static DEVICE_ATTR(fan1_fault, S_IRUGO, show_fan_fault, NULL);

static DEVICE_ATTR_RO(fan1_input);

static DEVICE_ATTR_RW(fan1_div);

static DEVICE_ATTR_RW(fan1_target);

static DEVICE_ATTR_RO(fan1_fault);



static DEVICE_ATTR(pwm1_enable, S_IRUGO | S_IWUSR, show_pwm_enable,

	set_pwm_enable);

static DEVICE_ATTR_RW(pwm1_enable);



/* sensors present on all models */

static struct attribute *emc2103_attributes[] = {