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

Commit 02728ffe authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare
Browse files

hwmon: (w83795) Rework beep_enable implementation 



Handle beep_enable just like all other beep bits. It doesn't need
anything special, so let's avoid redundant code. This also saves a
duplicate register read at initialization time.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 54891a3c

drivers/hwmon/w83795.c

+2 −38
Original line number Original line Diff line number Diff line
@@ -398,7 +398,6 @@ struct w83795_data { 




	u8 alarms[6];		/* Register value */

	u8 alarms[6];		/* Register value */

	u8 beeps[6];		/* Register value */

	u8 beeps[6];		/* Register value */

	u8 beep_enable;





	char valid;

	char valid;

};

};
@@ -616,39 +615,6 @@ store_beep(struct device *dev, struct device_attribute *attr, 
	return count;

	return count;

}

}





static ssize_t

show_beep_enable(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct w83795_data *data = i2c_get_clientdata(client);

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

}



static ssize_t

store_beep_enable(struct device *dev, struct device_attribute *attr,

		  const char *buf, size_t count)

{

	struct i2c_client *client = to_i2c_client(dev);

	struct w83795_data *data = i2c_get_clientdata(client);

	unsigned long val;

	u8 tmp;



	if (strict_strtoul(buf, 10, &val) < 0)

		return -EINVAL;

	if (val != 0 && val != 1)

		return -EINVAL;



	mutex_lock(&data->update_lock);

	data->beep_enable = val;

	tmp = w83795_read(client, W83795_REG_BEEP(5));

	tmp &= 0x7f;

	tmp |= val << 7;

	w83795_write(client, W83795_REG_BEEP(5), tmp);

	mutex_unlock(&data->update_lock);



	return count;

}



/* Write any value to clear chassis alarm */

/* Write any value to clear chassis alarm */

static ssize_t

static ssize_t

store_chassis_clear(struct device *dev,

store_chassis_clear(struct device *dev,
@@ -1689,8 +1655,8 @@ static const struct sensor_device_attribute_2 w83795_pwm[][7] = { 
static const struct sensor_device_attribute_2 sda_single_files[] = {

static const struct sensor_device_attribute_2 sda_single_files[] = {

	SENSOR_ATTR_2(chassis, S_IWUSR | S_IRUGO, show_alarm_beep,

	SENSOR_ATTR_2(chassis, S_IWUSR | S_IRUGO, show_alarm_beep,

		      store_chassis_clear, ALARM_STATUS, 46),

		      store_chassis_clear, ALARM_STATUS, 46),

	SENSOR_ATTR_2(beep_enable, S_IWUSR | S_IRUGO, show_beep_enable,

	SENSOR_ATTR_2(beep_enable, S_IWUSR | S_IRUGO, show_alarm_beep,

		      store_beep_enable, NOT_USED, NOT_USED),

		      store_beep, BEEP_ENABLE, 47),

	SENSOR_ATTR_2(speed_cruise_tolerance, S_IWUSR | S_IRUGO, show_fanin,

	SENSOR_ATTR_2(speed_cruise_tolerance, S_IWUSR | S_IRUGO, show_fanin,

		store_fanin, FANIN_TOL, NOT_USED),

		store_fanin, FANIN_TOL, NOT_USED),

	SENSOR_ATTR_2(pwm_default, S_IWUSR | S_IRUGO, show_sf_setup,

	SENSOR_ATTR_2(pwm_default, S_IWUSR | S_IRUGO, show_sf_setup,
@@ -2136,8 +2102,6 @@ static int w83795_probe(struct i2c_client *client, 
		data->alarms[i] = w83795_read(client, W83795_REG_ALARM(i));

		data->alarms[i] = w83795_read(client, W83795_REG_ALARM(i));

		data->beeps[i] = w83795_read(client, W83795_REG_BEEP(i));

		data->beeps[i] = w83795_read(client, W83795_REG_BEEP(i));

	}

	}

	data->beep_enable =

		(w83795_read(client, W83795_REG_BEEP(5)) >> 7) & 0x01;





	err = w83795_handle_files(dev, device_create_file);

	err = w83795_handle_files(dev, device_create_file);

	if (err)

	if (err)