[PATCH V2] i2c-imx: do not allow interruptions when waiting for I2C to complete (resend)

Marc Kleine-Budde

author

2010-06-15 10:20 UTC #0 lore raw

PATCH v2 1/1 i2c-imx: do not allow interruptions when waiting for I2C to complete (resend)

The i2c_imx_trx_complete() function is using wait_event_interruptible_timeout() to wait for the I2C controller to signal that it has completed an I2C bus operation. If the process that causes the I2C operation receives a signal, the wait will be interrupted, returning an error. It is better to let the I2C operation finished before handling the signal (i.e. returning into userspace).

It is safe to use wait_event_timeout() instead, because the timeout will allow the process to exit if the I2C bus hangs. It's also better to allow the I2C operation to finish, because unacknowledged I2C operations can cause the I2C bus to hang.

Signed-off-by Marc Kleine-Budde <[email protected]>

Reviewed-by Wolfram Sang <[email protected]>

---

V2: Remove check for "result < 0" as commented by Wolfram Sang.

 drivers/i2c/busses/i2c-imx.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

drivers/i2c/busses/i2c-imx.c +0 -0

index d1ff940..58df809 100644
@@ -161,13 +161,10 @@ static int i2c_imx_trx_complete(struct

imx_i2c_struct *i2c_imx)
{
int result;

- result = wait_event_interruptible_timeout(i2c_imx->queue,
+ result = wait_event_timeout(i2c_imx->queue,
i2c_imx->i2csr & I2SR_IIF, HZ / 10);

- if (unlikely(result < 0)) {
- dev_dbg(&i2c_imx->adapter.dev, "<%s> result < 0\n", __func__);
- return result;
- } else if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) {
+ if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) {
dev_dbg(&i2c_imx->adapter.dev, "<%s> Timeout\n", __func__); return -ETIMEDOUT;
}
@@ -295,7 +292,7 @@ static irqreturn_t i2c_imx_isr(int irq, void *dev_id)
i2c_imx->i2csr = temp;
temp &= ~I2SR_IIF;
writeb(temp, i2c_imx->base + IMX_I2C_I2SR);
- wake_up_interruptible(&i2c_imx->queue);
+ wake_up(&i2c_imx->queue);
return IRQ_HANDLED;
}

Signature · 1 line

1.7.1

Ben Dooks

2010-06-20 22:33 UTC #1 lore raw

Quoted 11 lines · Marc Kleine-Budde

The i2c_imx_trx_complete() function is using wait_event_interruptible_timeout() to wait for the I2C controller to signal that it has completed an I2C bus operation. If the process that causes the I2C operation receives a signal, the wait will be interrupted, returning an error. It is better to let the I2C operation finished before handling the signal (i.e. returning into userspace).
It is safe to use wait_event_timeout() instead, because the timeout will allow the process to exit if the I2C bus hangs. It's also better to allow the I2C operation to finish, because unacknowledged I2C operations can cause the I2C bus to hang.

Hmm, if it times out, do you need to at-least try sending a stop on the bus? or does the caller do that for you?

Quoted 42 lines

Signed-off-by Marc Kleine-Budde <[email protected]>

Reviewed-by Wolfram Sang <[email protected]>

---

V2: Remove check for "result < 0" as commented by Wolfram Sang.

 drivers/i2c/busses/i2c-imx.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

drivers/i2c/busses/i2c-imx.c +2 -5

index d1ff940..58df809 100644
@@ -161,13 +161,10 @@ static int i2c_imx_trx_complete(struct
 imx_i2c_struct *i2c_imx)
 {
 	int result;
 
-	result = wait_event_interruptible_timeout(i2c_imx->queue,
+	result = wait_event_timeout(i2c_imx->queue,
 		i2c_imx->i2csr & I2SR_IIF, HZ / 10);
 
-	if (unlikely(result < 0)) {
-		dev_dbg(&i2c_imx->adapter.dev, "<%s> result < 0\n", __func__);
-		return result;
-	} else if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) {
+	if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) {
 		dev_dbg(&i2c_imx->adapter.dev, "<%s> Timeout\n", __func__);
 		return -ETIMEDOUT;

drivers/i2c/busses/i2c-imx.c +1 -1

@@ -295,7 +292,7 @@ static irqreturn_t i2c_imx_isr(int irq, void *dev_id)
 		i2c_imx->i2csr = temp;
 		temp &= ~I2SR_IIF;
 		writeb(temp, i2c_imx->base + IMX_I2C_I2SR);
-		wake_up_interruptible(&i2c_imx->queue);
+		wake_up(&i2c_imx->queue);
 		return IRQ_HANDLED;
 	}

Signature · 1 line

1.7.1

Signature · 3 lines

Ben ([email protected], http://www.fluff.org/)

  'a smiley only costs 4 bytes'

Marc Kleine-Budde

author

2010-06-21 07:07 UTC #2 lore raw

Quoted 8 lines · Ben Dooks

Quoted 7 lines · Marc Kleine-Budde
The i2c_imx_trx_complete() function is using wait_event_interruptible_timeout() to wait for the I2C controller to signal that it has completed an I2C bus operation. If the process that causes the I2C operation receives a signal, the wait will be interrupted, returning an error. It is better to let the I2C operation finished before handling the signal (i.e. returning into userspace).

Quoted 7 lines

Quoted 4 lines
It is safe to use wait_event_timeout() instead, because the timeout will allow the process to exit if the I2C bus hangs. It's also better to allow the I2C operation to finish, because unacknowledged I2C operations can cause the I2C bus to hang.
Hmm, if it times out, do you need to at-least try sending a stop on the bus? or does the caller do that for you?

The caller of the caller does this. "i2c_imx_xfer" will call "i2c_imx_stop", and this function will generate the stop condition if not already done so.

I'm sending a V3 version of the patch, which removes the only written to variable "result".

cheers, Marc

Signature · 4 lines

Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |

Marc Kleine-Budde

2010-06-21 07:27 UTC #4 lore raw

PATCH v3 1/1 i2c-imx: do not allow interruptions when waiting for I2C to complete

The i2c_imx_trx_complete() function is using wait_event_interruptible_timeout() to wait for the I2C controller to signal that it has completed an I2C bus operation. If the process that causes the I2C operation receives a signal, the wait will be interrupted, returning an error. It is better to let the I2C operation finished before handling the signal (i.e. returning into userspace).

It is safe to use wait_event_timeout() instead, because the timeout will allow the process to exit if the I2C bus hangs. It's also better to allow the I2C operation to finish, because unacknowledged I2C operations can cause the I2C bus to hang.

Signed-off-by Marc Kleine-Budde <[email protected]>

Reviewed-by Wolfram Sang <[email protected]>

---

V2: Remove check for "result < 0" as commented by Wolfram Sang.
V3: Remove "result" entirely.

 drivers/i2c/busses/i2c-imx.c |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

drivers/i2c/busses/i2c-imx.c +3 -9

index d1ff940..4c2a62b 100644
@@ -159,15 +159,9 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy)
 
 static int i2c_imx_trx_complete(struct imx_i2c_struct *i2c_imx)
 {
-	int result;
-
-	result = wait_event_interruptible_timeout(i2c_imx->queue,
-		i2c_imx->i2csr & I2SR_IIF, HZ / 10);
+	wait_event_timeout(i2c_imx->queue, i2c_imx->i2csr & I2SR_IIF, HZ / 10);
 
-	if (unlikely(result < 0)) {
-		dev_dbg(&i2c_imx->adapter.dev, "<%s> result < 0\n", __func__);
-		return result;
-	} else if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) {
+	if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) {
 		dev_dbg(&i2c_imx->adapter.dev, "<%s> Timeout\n", __func__);
 		return -ETIMEDOUT;
 	}

@@ -295,7 +289,7 @@ static irqreturn_t i2c_imx_isr(int irq, void *dev_id)
 		i2c_imx->i2csr = temp;
 		temp &= ~I2SR_IIF;
 		writeb(temp, i2c_imx->base + IMX_I2C_I2SR);
-		wake_up_interruptible(&i2c_imx->queue);
+		wake_up(&i2c_imx->queue);
 		return IRQ_HANDLED;
 	}

Signature · 1 line

1.7.1

Marc Kleine-Budde

2010-07-15 07:49 UTC #5 lore raw

PATCH RESEND v3 1/1 i2c-imx: do not allow interruptions when waiting for I2C to complete

In reply to a message not in the archive

The i2c_imx_trx_complete() function is using wait_event_interruptible_timeout() to wait for the I2C controller to signal that it has completed an I2C bus operation. If the process that causes the I2C operation receives a signal, the wait will be interrupted, returning an error. It is better to let the I2C operation finished before handling the signal (i.e. returning into userspace).

It is safe to use wait_event_timeout() instead, because the timeout will allow the process to exit if the I2C bus hangs. It's also better to allow the I2C operation to finish, because unacknowledged I2C operations can cause the I2C bus to hang.

Signed-off-by Marc Kleine-Budde <[email protected]>

Reviewed-by Wolfram Sang <[email protected]>

---

V2: Remove check for "result < 0" as commented by Wolfram Sang.
V3: Remove "result" entirely.

 drivers/i2c/busses/i2c-imx.c |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

drivers/i2c/busses/i2c-imx.c +0 -0

index d1ff940..4c2a62b 100644
@@ -159,15 +159,9 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct

*i2c_imx, int for_busy)

static int i2c_imx_trx_complete(struct imx_i2c_struct *i2c_imx) {
- int result;
-
- result = wait_event_interruptible_timeout(i2c_imx->queue,
- i2c_imx->i2csr & I2SR_IIF, HZ / 10);
+ wait_event_timeout(i2c_imx->queue, i2c_imx->i2csr & I2SR_IIF, HZ / 10);

- if (unlikely(result < 0)) {
- dev_dbg(&i2c_imx->adapter.dev, "<%s> result < 0\n", __func__);
- return result;
- } else if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) {
+ if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) {
dev_dbg(&i2c_imx->adapter.dev, "<%s> Timeout\n", __func__); return -ETIMEDOUT;
}
@@ -295,7 +289,7 @@ static irqreturn_t i2c_imx_isr(int irq, void *dev_id)
i2c_imx->i2csr = temp;
temp &= ~I2SR_IIF;
writeb(temp, i2c_imx->base + IMX_I2C_I2SR);
- wake_up_interruptible(&i2c_imx->queue);
+ wake_up(&i2c_imx->queue);
return IRQ_HANDLED;
}

Signature · 6 lines

1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Marc Kleine-Budde

2010-07-19 08:11 UTC #6 lore raw

PATCH v3 1/1 i2c-imx: do not allow interruptions when waiting for I2C to complete

In reply to a message not in the archive

Hello Ben,

what about this patch?

cheers, Marc

--------8<--------8<--------8<--------8<--------8<--------8<--------

The i2c_imx_trx_complete() function is using wait_event_interruptible_timeout() to wait for the I2C controller to signal that it has completed an I2C bus operation. If the process that causes the I2C operation receives a signal, the wait will be interrupted, returning an error. It is better to let the I2C operation finished before handling the signal (i.e. returning into userspace).

It is safe to use wait_event_timeout() instead, because the timeout will allow the process to exit if the I2C bus hangs. It's also better to allow the I2C operation to finish, because unacknowledged I2C operations can cause the I2C bus to hang.

Signed-off-by Marc Kleine-Budde <[email protected]>

Reviewed-by Wolfram Sang <[email protected]>

---

V2: Remove check for "result < 0" as commented by Wolfram Sang.
V3: Remove "result" entirely.

 drivers/i2c/busses/i2c-imx.c |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

drivers/i2c/busses/i2c-imx.c +0 -0

index d1ff940..4c2a62b 100644
@@ -159,15 +159,9 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct

*i2c_imx, int for_busy)

static int i2c_imx_trx_complete(struct imx_i2c_struct *i2c_imx) {
- int result;
-
- result = wait_event_interruptible_timeout(i2c_imx->queue,
- i2c_imx->i2csr & I2SR_IIF, HZ / 10);
+ wait_event_timeout(i2c_imx->queue, i2c_imx->i2csr & I2SR_IIF, HZ / 10);

- if (unlikely(result < 0)) {
- dev_dbg(&i2c_imx->adapter.dev, "<%s> result < 0\n", __func__);
- return result;
- } else if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) {
+ if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) {
dev_dbg(&i2c_imx->adapter.dev, "<%s> Timeout\n", __func__); return -ETIMEDOUT;
}
@@ -295,7 +289,7 @@ static irqreturn_t i2c_imx_isr(int irq, void *dev_id)
i2c_imx->i2csr = temp;
temp &= ~I2SR_IIF;
writeb(temp, i2c_imx->base + IMX_I2C_I2SR);
- wake_up_interruptible(&i2c_imx->queue);
+ wake_up(&i2c_imx->queue);
return IRQ_HANDLED;
}

Signature · 6 lines

1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Marc Kleine-Budde

2010-09-15 11:45 UTC #7 lore raw

PATCH v3 1/1 i2c-imx: do not allow interruptions when waiting for I2C to complete

In reply to a message not in the archive

Hello Ben,

what about this patch?

cheers, Marc

--------8<--------8<--------8<--------8<--------8<--------8<--------

The i2c_imx_trx_complete() function is using wait_event_interruptible_timeout() to wait for the I2C controller to signal that it has completed an I2C bus operation. If the process that causes the I2C operation receives a signal, the wait will be interrupted, returning an error. It is better to let the I2C operation finished before handling the signal (i.e. returning into userspace).

It is safe to use wait_event_timeout() instead, because the timeout will allow the process to exit if the I2C bus hangs. It's also better to allow the I2C operation to finish, because unacknowledged I2C operations can cause the I2C bus to hang.

Signed-off-by Marc Kleine-Budde <[email protected]>

Reviewed-by Wolfram Sang <[email protected]>

---

V2: Remove check for "result < 0" as commented by Wolfram Sang.
V3: Remove "result" entirely.

 drivers/i2c/busses/i2c-imx.c |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

drivers/i2c/busses/i2c-imx.c +0 -0

index d1ff940..4c2a62b 100644
@@ -159,15 +159,9 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct

*i2c_imx, int for_busy)

static int i2c_imx_trx_complete(struct imx_i2c_struct *i2c_imx) {
- int result;
-
- result = wait_event_interruptible_timeout(i2c_imx->queue,
- i2c_imx->i2csr & I2SR_IIF, HZ / 10);
+ wait_event_timeout(i2c_imx->queue, i2c_imx->i2csr & I2SR_IIF, HZ / 10);

- if (unlikely(result < 0)) {
- dev_dbg(&i2c_imx->adapter.dev, "<%s> result < 0\n", __func__);
- return result;
- } else if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) {
+ if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) {
dev_dbg(&i2c_imx->adapter.dev, "<%s> Timeout\n", __func__); return -ETIMEDOUT;
}
@@ -295,7 +289,7 @@ static irqreturn_t i2c_imx_isr(int irq, void *dev_id)
i2c_imx->i2csr = temp;
temp &= ~I2SR_IIF;
writeb(temp, i2c_imx->base + IMX_I2C_I2SR);
- wake_up_interruptible(&i2c_imx->queue);
+ wake_up(&i2c_imx->queue);
return IRQ_HANDLED;
}

Signature · 6 lines

1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Marc Kleine-Budde

2010-09-24 14:50 UTC #8 lore raw

PATCH v3 1/1 i2c-imx: do not allow interruptions when waiting for I2C to complete

In reply to a message not in the archive

Hello Ben,

what about this patch?

cheers, Marc

--------8<--------8<--------8<--------8<--------8<--------8<--------

The i2c_imx_trx_complete() function is using wait_event_interruptible_timeout() to wait for the I2C controller to signal that it has completed an I2C bus operation. If the process that causes the I2C operation receives a signal, the wait will be interrupted, returning an error. It is better to let the I2C operation finished before handling the signal (i.e. returning into userspace).

It is safe to use wait_event_timeout() instead, because the timeout will allow the process to exit if the I2C bus hangs. It's also better to allow the I2C operation to finish, because unacknowledged I2C operations can cause the I2C bus to hang.

Signed-off-by Marc Kleine-Budde <[email protected]>

Reviewed-by Wolfram Sang <[email protected]>

---

V2: Remove check for "result < 0" as commented by Wolfram Sang.
V3: Remove "result" entirely.

 drivers/i2c/busses/i2c-imx.c |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

drivers/i2c/busses/i2c-imx.c +0 -0

index d1ff940..4c2a62b 100644
@@ -159,15 +159,9 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct

*i2c_imx, int for_busy)

static int i2c_imx_trx_complete(struct imx_i2c_struct *i2c_imx) {
- int result;
-
- result = wait_event_interruptible_timeout(i2c_imx->queue,
- i2c_imx->i2csr & I2SR_IIF, HZ / 10);
+ wait_event_timeout(i2c_imx->queue, i2c_imx->i2csr & I2SR_IIF, HZ / 10);

- if (unlikely(result < 0)) {
- dev_dbg(&i2c_imx->adapter.dev, "<%s> result < 0\n", __func__);
- return result;
- } else if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) {
+ if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) {
dev_dbg(&i2c_imx->adapter.dev, "<%s> Timeout\n", __func__); return -ETIMEDOUT;
}
@@ -295,7 +289,7 @@ static irqreturn_t i2c_imx_isr(int irq, void *dev_id)
i2c_imx->i2csr = temp;
temp &= ~I2SR_IIF;
writeb(temp, i2c_imx->base + IMX_I2C_I2SR);
- wake_up_interruptible(&i2c_imx->queue);
+ wake_up(&i2c_imx->queue);
return IRQ_HANDLED;
}

Signature · 6 lines

1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Wolfram Sang

2010-09-28 09:05 UTC #10 lore raw

Re: [PATCH V3 RESEND4] i2c-imx: do not allow interruptions when waiting for I2C to complete

Quoted 3 lines · Marc Kleine-Budde

Hello Ben,
what about this patch?

Ben, any reason you did not pick up this one while you were picking up other patches?

Quoted 73 lines

cheers, Marc
--------8<--------8<--------8<--------8<--------8<--------8<--------
The i2c_imx_trx_complete() function is using wait_event_interruptible_timeout() to wait for the I2C controller to signal that it has completed an I2C bus operation. If the process that causes the I2C operation receives a signal, the wait will be interrupted, returning an error. It is better to let the I2C operation finished before handling the signal (i.e. returning into userspace).
It is safe to use wait_event_timeout() instead, because the timeout will allow the process to exit if the I2C bus hangs. It's also better to allow the I2C operation to finish, because unacknowledged I2C operations can cause the I2C bus to hang.
Signed-off-by Marc Kleine-Budde <[email protected]>
Reviewed-by Wolfram Sang <[email protected]>
---
V2: Remove check for "result < 0" as commented by Wolfram Sang.
V3: Remove "result" entirely.
 drivers/i2c/busses/i2c-imx.c |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)
drivers/i2c/busses/i2c-imx.c +2 -8
index d1ff940..4c2a62b 100644
@@ -159,15 +159,9 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct
 *i2c_imx, int for_busy)
 
 static int i2c_imx_trx_complete(struct imx_i2c_struct *i2c_imx)
 {
-	int result;
-
-	result = wait_event_interruptible_timeout(i2c_imx->queue,
-		i2c_imx->i2csr & I2SR_IIF, HZ / 10);
+	wait_event_timeout(i2c_imx->queue, i2c_imx->i2csr & I2SR_IIF, HZ / 10);
 
-	if (unlikely(result < 0)) {
-		dev_dbg(&i2c_imx->adapter.dev, "<%s> result < 0\n", __func__);
-		return result;
-	} else if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) {
+	if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) {
 		dev_dbg(&i2c_imx->adapter.dev, "<%s> Timeout\n", __func__);
 		return -ETIMEDOUT;
drivers/i2c/busses/i2c-imx.c +1 -1
 	}
@@ -295,7 +289,7 @@ static irqreturn_t i2c_imx_isr(int irq, void *dev_id)
 		i2c_imx->i2csr = temp;
 		temp &= ~I2SR_IIF;
 		writeb(temp, i2c_imx->base + IMX_I2C_I2SR);
-		wake_up_interruptible(&i2c_imx->queue);
+		wake_up(&i2c_imx->queue);
 		return IRQ_HANDLED;
 	}
 
Signature · 6 lines
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Signature · 2 lines

Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

Marc Kleine-Budde

2010-10-04 14:22 UTC #11 lore raw

PATCH v3 1/1 i2c-imx: do not allow interruptions when waiting for I2C to complete

In reply to a message not in the archive

Hello Ben,

I've send this patch several times, can you please comment it or apply it to your git tree. Please send me a note if you do so, then I can stop bugging you :)

cheers, Marc

--------8<--------8<--------8<--------8<--------8<--------8<--------

The i2c_imx_trx_complete() function is using wait_event_interruptible_timeout() to wait for the I2C controller to signal that it has completed an I2C bus operation. If the process that causes the I2C operation receives a signal, the wait will be interrupted, returning an error. It is better to let the I2C operation finished before handling the signal (i.e. returning into userspace).

It is safe to use wait_event_timeout() instead, because the timeout will allow the process to exit if the I2C bus hangs. It's also better to allow the I2C operation to finish, because unacknowledged I2C operations can cause the I2C bus to hang.

Signed-off-by Marc Kleine-Budde <[email protected]>

Reviewed-by Wolfram Sang <[email protected]>

---

V2: Remove check for "result < 0" as commented by Wolfram Sang.
V3: Remove "result" entirely.

 drivers/i2c/busses/i2c-imx.c |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

drivers/i2c/busses/i2c-imx.c +0 -0

index d1ff940..4c2a62b 100644
@@ -159,15 +159,9 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct

*i2c_imx, int for_busy)

static int i2c_imx_trx_complete(struct imx_i2c_struct *i2c_imx) {
- int result;
-
- result = wait_event_interruptible_timeout(i2c_imx->queue,
- i2c_imx->i2csr & I2SR_IIF, HZ / 10);
+ wait_event_timeout(i2c_imx->queue, i2c_imx->i2csr & I2SR_IIF, HZ / 10);

- if (unlikely(result < 0)) {
- dev_dbg(&i2c_imx->adapter.dev, "<%s> result < 0\n", __func__);
- return result;
- } else if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) {
+ if (unlikely(!(i2c_imx->i2csr & I2SR_IIF))) {
dev_dbg(&i2c_imx->adapter.dev, "<%s> Timeout\n", __func__); return -ETIMEDOUT;
}
@@ -295,7 +289,7 @@ static irqreturn_t i2c_imx_isr(int irq, void *dev_id)
i2c_imx->i2csr = temp;
temp &= ~I2SR_IIF;
writeb(temp, i2c_imx->base + IMX_I2C_I2SR);
- wake_up_interruptible(&i2c_imx->queue);
+ wake_up(&i2c_imx->queue);
return IRQ_HANDLED;
}

Signature · 6 lines

1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html