aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2011-01-12 15:55:11 -0500
committerJean Delvare <khali@endymion.delvare>2011-01-12 15:55:11 -0500
commit36c7fe133e29a0b2558edaef18b2401e99765417 (patch)
treeacf904bde2e82ee480c8c9cc37f70bf52e680466 /drivers
parent1b7243e8f51157103dcca33236163a191c8afd01 (diff)
hwmon: (w83793) Drop useless mutex
This is the same case as fschmd, from which the code was copied as far as I can see. So the same clean-up applies: 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: Jean Delvare <khali@linux-fr.org> Cc: Hans de Goede <hdegoede@redhat.com> Acked-by: Guenter Roeck <guenter.roeck@ericsson.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwmon/w83793.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c
index d0c30124c13b..e3bdedfb5347 100644
--- a/drivers/hwmon/w83793.c
+++ b/drivers/hwmon/w83793.c
@@ -51,7 +51,6 @@
51#define WATCHDOG_TIMEOUT 2 /* 2 minute default timeout */ 51#define WATCHDOG_TIMEOUT 2 /* 2 minute default timeout */
52 52
53/* Addresses to scan */ 53/* Addresses to scan */
54static DEFINE_MUTEX(watchdog_mutex);
55static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, 54static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
56 I2C_CLIENT_END }; 55 I2C_CLIENT_END };
57 56
@@ -1350,7 +1349,7 @@ static ssize_t watchdog_write(struct file *filp, const char __user *buf,
1350static long watchdog_ioctl(struct file *filp, unsigned int cmd, 1349static long watchdog_ioctl(struct file *filp, unsigned int cmd,
1351 unsigned long arg) 1350 unsigned long arg)
1352{ 1351{
1353 static struct watchdog_info ident = { 1352 struct watchdog_info ident = {
1354 .options = WDIOF_KEEPALIVEPING | 1353 .options = WDIOF_KEEPALIVEPING |
1355 WDIOF_SETTIMEOUT | 1354 WDIOF_SETTIMEOUT |
1356 WDIOF_CARDRESET, 1355 WDIOF_CARDRESET,
@@ -1360,7 +1359,6 @@ static long watchdog_ioctl(struct file *filp, unsigned int cmd,
1360 int val, ret = 0; 1359 int val, ret = 0;
1361 struct w83793_data *data = filp->private_data; 1360 struct w83793_data *data = filp->private_data;
1362 1361
1363 mutex_lock(&watchdog_mutex);
1364 switch (cmd) { 1362 switch (cmd) {
1365 case WDIOC_GETSUPPORT: 1363 case WDIOC_GETSUPPORT:
1366 if (!nowayout) 1364 if (!nowayout)
@@ -1414,7 +1412,6 @@ static long watchdog_ioctl(struct file *filp, unsigned int cmd,
1414 default: 1412 default:
1415 ret = -ENOTTY; 1413 ret = -ENOTTY;
1416 } 1414 }
1417 mutex_unlock(&watchdog_mutex);
1418 return ret; 1415 return ret;
1419} 1416}
1420 1417