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

Commit 1b7243e8 authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare
Browse files

hwmon: (fschmd) Drop useless mutex 

As discussed one year ago, the WDIOC_GETSUPPORT ioctl only needs a
mutex because it operates on a static variable. There is no good
reason to keep this variable static, so let's just make it non-static
and drop the now useless mutex altogether.

See the discussion at:
http://marc.info/?l=lm-sensors&m=125563869402323&w=2



Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Acked-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 1ca28218

drivers/hwmon/fschmd.c

+1 −4
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ 
#include <linux/kref.h>



/* Addresses to scan */

static DEFINE_MUTEX(watchdog_mutex);

static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };



/* Insmod parameters */
@@ -850,7 +849,7 @@ static ssize_t watchdog_write(struct file *filp, const char __user *buf, 


static long watchdog_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)

{

	static struct watchdog_info ident = {

	struct watchdog_info ident = {

		.options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT |

				WDIOF_CARDRESET,

		.identity = "FSC watchdog"
@@ -858,7 +857,6 @@ static long watchdog_ioctl(struct file *filp, unsigned int cmd, unsigned long ar 
	int i, ret = 0;

	struct fschmd_data *data = filp->private_data;



	mutex_lock(&watchdog_mutex);

	switch (cmd) {

	case WDIOC_GETSUPPORT:

		ident.firmware_version = data->revision;
@@ -915,7 +913,6 @@ static long watchdog_ioctl(struct file *filp, unsigned int cmd, unsigned long ar 
	default:

		ret = -ENOTTY;

	}

	mutex_unlock(&watchdog_mutex);

	return ret;

}