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

Commit 0cbcb4d3 authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files

[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: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c006705e

drivers/i2c/busses/i2c-ali1535.c

+0 −4
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ 
#include <linux/ioport.h>

#include <linux/i2c.h>

#include <linux/init.h>

#include <linux/mutex.h>

#include <asm/io.h>
@@ -136,7 +135,6 @@ 


static struct pci_driver ali1535_driver;

static unsigned short ali1535_smba;

static DEFINE_MUTEX(i2c_ali1535_mutex);



/* Detect whether a ALI1535 can be found, and initialize it, where necessary.

   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;

	s32 result = 0;



	mutex_lock(&i2c_ali1535_mutex);

	/* make sure SMBus is idle */

	temp = inb_p(SMBHSTSTS);

	for (timeout = 0;
@@ -460,7 +457,6 @@ static s32 ali1535_access(struct i2c_adapter *adap, u16 addr, 
		break;

	}

EXIT:

	mutex_unlock(&i2c_ali1535_mutex);

	return result;

}