diff options
author | Jean Delvare <khali@linux-fr.org> | 2006-02-27 17:08:18 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-03-23 17:21:54 -0500 |
commit | 0cbcb4d39a83d4df7e45c13b5ebd9fe73e025237 (patch) | |
tree | 3387e04193267442517e3683a2d4153d2ab5bff4 /drivers | |
parent | c006705e0f6a195d122be8d5344a4257c269f559 (diff) |
[PATCH] I2C: i2c-ali1535: Drop redundant mutex
Drop a redundant mutex in driver i2c-ali1535. The struct i2c_adapter
includes a mutex for the same purpose, operated by i2c-core.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/i2c/busses/i2c-ali1535.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c index 115a7312948e..d3ef46aeeb3c 100644 --- a/drivers/i2c/busses/i2c-ali1535.c +++ b/drivers/i2c/busses/i2c-ali1535.c | |||
@@ -62,7 +62,6 @@ | |||
62 | #include <linux/ioport.h> | 62 | #include <linux/ioport.h> |
63 | #include <linux/i2c.h> | 63 | #include <linux/i2c.h> |
64 | #include <linux/init.h> | 64 | #include <linux/init.h> |
65 | #include <linux/mutex.h> | ||
66 | #include <asm/io.h> | 65 | #include <asm/io.h> |
67 | 66 | ||
68 | 67 | ||
@@ -136,7 +135,6 @@ | |||
136 | 135 | ||
137 | static struct pci_driver ali1535_driver; | 136 | static struct pci_driver ali1535_driver; |
138 | static unsigned short ali1535_smba; | 137 | static unsigned short ali1535_smba; |
139 | static DEFINE_MUTEX(i2c_ali1535_mutex); | ||
140 | 138 | ||
141 | /* Detect whether a ALI1535 can be found, and initialize it, where necessary. | 139 | /* Detect whether a ALI1535 can be found, and initialize it, where necessary. |
142 | Note the differences between kernels with the old PCI BIOS interface and | 140 | Note the differences between kernels with the old PCI BIOS interface and |
@@ -345,7 +343,6 @@ static s32 ali1535_access(struct i2c_adapter *adap, u16 addr, | |||
345 | int timeout; | 343 | int timeout; |
346 | s32 result = 0; | 344 | s32 result = 0; |
347 | 345 | ||
348 | mutex_lock(&i2c_ali1535_mutex); | ||
349 | /* make sure SMBus is idle */ | 346 | /* make sure SMBus is idle */ |
350 | temp = inb_p(SMBHSTSTS); | 347 | temp = inb_p(SMBHSTSTS); |
351 | for (timeout = 0; | 348 | for (timeout = 0; |
@@ -460,7 +457,6 @@ static s32 ali1535_access(struct i2c_adapter *adap, u16 addr, | |||
460 | break; | 457 | break; |
461 | } | 458 | } |
462 | EXIT: | 459 | EXIT: |
463 | mutex_unlock(&i2c_ali1535_mutex); | ||
464 | return result; | 460 | return result; |
465 | } | 461 | } |
466 | 462 | ||