From khali@linux-fr.org Wed Jan 18 14:16:14 2006 Date: Wed, 18 Jan 2006 23:17:01 +0100 From: Jean Delvare To: Greg KH Cc: Ingo Molnar Subject: [PATCH 14/17] i2c: Semaphore to mutex conversions, part 3 Message-Id: <20060118231701.3d26b007.khali@linux-fr.org> Content-Disposition: inline; filename=i2c-convert-semaphores-to-mutexes-3.patch Cleanup after the semaphores to mutexes conversions in the i2c subsystem. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman --- drivers/i2c/busses/i2c-ali1535.c | 1 - drivers/i2c/busses/i2c-pxa.c | 2 +- drivers/i2c/busses/scx200_acb.c | 9 +++++---- 3 files changed, 6 insertions(+), 6 deletions(-) --- gregkh-2.6.orig/drivers/i2c/busses/i2c-ali1535.c +++ gregkh-2.6/drivers/i2c/busses/i2c-ali1535.c @@ -64,7 +64,6 @@ #include #include #include -#include /* ALI1535 SMBus address offsets */ --- gregkh-2.6.orig/drivers/i2c/busses/i2c-pxa.c +++ gregkh-2.6/drivers/i2c/busses/i2c-pxa.c @@ -647,7 +647,7 @@ static inline void i2c_pxa_start_message } /* - * We are protected by the adapter bus semaphore. + * We are protected by the adapter bus mutex. */ static int i2c_pxa_do_xfer(struct pxa_i2c *i2c, struct i2c_msg *msg, int num) { --- gregkh-2.6.orig/drivers/i2c/busses/scx200_acb.c +++ gregkh-2.6/drivers/i2c/busses/scx200_acb.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -74,7 +75,7 @@ struct scx200_acb_iface { struct scx200_acb_iface *next; struct i2c_adapter adapter; unsigned base; - struct semaphore sem; + struct mutex mutex; /* State machine data */ enum scx200_acb_state state; @@ -314,7 +315,7 @@ static s32 scx200_acb_smbus_xfer(struct return -EINVAL; } - down(&iface->sem); + mutex_lock(&iface->mutex); iface->address_byte = (address << 1) | rw; iface->command = command; @@ -338,7 +339,7 @@ static s32 scx200_acb_smbus_xfer(struct rc = iface->result; - up(&iface->sem); + mutex_unlock(&iface->mutex); if (rc == 0 && size == I2C_SMBUS_WORD_DATA && rw == I2C_SMBUS_READ) data->word = le16_to_cpu(cur_word); @@ -431,7 +432,7 @@ static int __init scx200_acb_create(con adapter->algo = &scx200_acb_algorithm; adapter->class = I2C_CLASS_HWMON; - init_MUTEX(&iface->sem); + mutex_init(&iface->mutex); snprintf(description, sizeof(description), "%s ACCESS.bus [%s]", text, adapter->name);