Commit 44007117 authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: (max6650) Auto-convert to use SENSOR_DEVICE_ATTR_{RO, RW, WO} 

Conversion was done done using the coccinelle script at
https://github.com/groeck/coccinelle-patches/raw/master/hwmon/sensor-devattr-w6.cocci



Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 3d628b29

drivers/hwmon/max6650.c

+13 −18
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static int max6650_set_operating_mode(struct max6650_data *data, u8 mode) 
	return 0;

}



static ssize_t get_fan(struct device *dev, struct device_attribute *devattr,

static ssize_t fan_show(struct device *dev, struct device_attribute *devattr,

			char *buf)

{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
@@ -514,8 +514,8 @@ static ssize_t fan1_div_store(struct device *dev, 
 * 1 = alarm

 */



static ssize_t get_alarm(struct device *dev, struct device_attribute *devattr,

			 char *buf)

static ssize_t alarm_show(struct device *dev,

			  struct device_attribute *devattr, char *buf)

{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);

	struct max6650_data *data = max6650_update_device(dev);
@@ -534,24 +534,19 @@ static ssize_t get_alarm(struct device *dev, struct device_attribute *devattr, 
	return sprintf(buf, "%d\n", alarm);

}



static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, get_fan, NULL, 0);

static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, get_fan, NULL, 1);

static SENSOR_DEVICE_ATTR(fan3_input, S_IRUGO, get_fan, NULL, 2);

static SENSOR_DEVICE_ATTR(fan4_input, S_IRUGO, get_fan, NULL, 3);

static SENSOR_DEVICE_ATTR_RO(fan1_input, fan, 0);

static SENSOR_DEVICE_ATTR_RO(fan2_input, fan, 1);

static SENSOR_DEVICE_ATTR_RO(fan3_input, fan, 2);

static SENSOR_DEVICE_ATTR_RO(fan4_input, fan, 3);

static DEVICE_ATTR_RW(fan1_target);

static DEVICE_ATTR_RW(fan1_div);

static DEVICE_ATTR_RW(pwm1_enable);

static DEVICE_ATTR_RW(pwm1);

static SENSOR_DEVICE_ATTR(fan1_max_alarm, S_IRUGO, get_alarm, NULL,

			  MAX6650_ALRM_MAX);

static SENSOR_DEVICE_ATTR(fan1_min_alarm, S_IRUGO, get_alarm, NULL,

			  MAX6650_ALRM_MIN);

static SENSOR_DEVICE_ATTR(fan1_fault, S_IRUGO, get_alarm, NULL,

			  MAX6650_ALRM_TACH);

static SENSOR_DEVICE_ATTR(gpio1_alarm, S_IRUGO, get_alarm, NULL,

			  MAX6650_ALRM_GPIO1);

static SENSOR_DEVICE_ATTR(gpio2_alarm, S_IRUGO, get_alarm, NULL,

			  MAX6650_ALRM_GPIO2);

static SENSOR_DEVICE_ATTR_RO(fan1_max_alarm, alarm, MAX6650_ALRM_MAX);

static SENSOR_DEVICE_ATTR_RO(fan1_min_alarm, alarm, MAX6650_ALRM_MIN);

static SENSOR_DEVICE_ATTR_RO(fan1_fault, alarm, MAX6650_ALRM_TACH);

static SENSOR_DEVICE_ATTR_RO(gpio1_alarm, alarm, MAX6650_ALRM_GPIO1);

static SENSOR_DEVICE_ATTR_RO(gpio2_alarm, alarm, MAX6650_ALRM_GPIO2);



static umode_t max6650_attrs_visible(struct kobject *kobj, struct attribute *a,

				    int n)