[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>
This commit is contained in:
parent
c006705e0f
commit
0cbcb4d39a
@ -62,7 +62,6 @@
|
|||||||
#include <linux/ioport.h>
|
#include <linux/ioport.h>
|
||||||
#include <linux/i2c.h>
|
#include <linux/i2c.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/mutex.h>
|
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
|
|
||||||
|
|
||||||
@ -136,7 +135,6 @@
|
|||||||
|
|
||||||
static struct pci_driver ali1535_driver;
|
static struct pci_driver ali1535_driver;
|
||||||
static unsigned short ali1535_smba;
|
static unsigned short ali1535_smba;
|
||||||
static DEFINE_MUTEX(i2c_ali1535_mutex);
|
|
||||||
|
|
||||||
/* Detect whether a ALI1535 can be found, and initialize it, where necessary.
|
/* Detect whether a ALI1535 can be found, and initialize it, where necessary.
|
||||||
Note the differences between kernels with the old PCI BIOS interface and
|
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,
|
|||||||
int timeout;
|
int timeout;
|
||||||
s32 result = 0;
|
s32 result = 0;
|
||||||
|
|
||||||
mutex_lock(&i2c_ali1535_mutex);
|
|
||||||
/* make sure SMBus is idle */
|
/* make sure SMBus is idle */
|
||||||
temp = inb_p(SMBHSTSTS);
|
temp = inb_p(SMBHSTSTS);
|
||||||
for (timeout = 0;
|
for (timeout = 0;
|
||||||
@ -460,7 +457,6 @@ static s32 ali1535_access(struct i2c_adapter *adap, u16 addr,
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
EXIT:
|
EXIT:
|
||||||
mutex_unlock(&i2c_ali1535_mutex);
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user