* [PATCH] i2c/pca: Don't use *_interruptible
@ 2010-01-12 14:27 Wolfram Sang
[not found] ` <1263306460-24530-1-git-send-email-w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
0 siblings, 1 reply; 2+ messages in thread
From: Wolfram Sang @ 2010-01-12 14:27 UTC (permalink / raw)
To: linux-i2c-u79uwXL29TY76Z2rM5mHXA; +Cc: Wolfram Sang, Jean Delvare
Unexpected signals can disturb the bus-handling and lock it up. Don't use
interruptible in 'wait_event_*' and 'wake_*' as in commits
dc1972d02747d2170fb1d78d114801f5ecb27506 (for cpm),
1ab082d7cbd0f34e39a5396cc6340c00bc5d66ef (for mpc),
b7af349b175af45f9d87b3bf3f0a221e1831ed39 (for omap).
Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
Cc: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>
---
Tested with custom hardware.
drivers/i2c/busses/i2c-pca-isa.c | 4 ++--
drivers/i2c/busses/i2c-pca-platform.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/i2c/busses/i2c-pca-isa.c b/drivers/i2c/busses/i2c-pca-isa.c
index 0ed68e2..f7346a9 100644
--- a/drivers/i2c/busses/i2c-pca-isa.c
+++ b/drivers/i2c/busses/i2c-pca-isa.c
@@ -75,7 +75,7 @@ static int pca_isa_waitforcompletion(void *pd)
unsigned long timeout;
if (irq > -1) {
- ret = wait_event_interruptible_timeout(pca_wait,
+ ret = wait_event_timeout(pca_wait,
pca_isa_readbyte(pd, I2C_PCA_CON)
& I2C_PCA_CON_SI, pca_isa_ops.timeout);
} else {
@@ -96,7 +96,7 @@ static void pca_isa_resetchip(void *pd)
}
static irqreturn_t pca_handler(int this_irq, void *dev_id) {
- wake_up_interruptible(&pca_wait);
+ wake_up(&pca_wait);
return IRQ_HANDLED;
}
diff --git a/drivers/i2c/busses/i2c-pca-platform.c b/drivers/i2c/busses/i2c-pca-platform.c
index c4df9d4..5b2213d 100644
--- a/drivers/i2c/busses/i2c-pca-platform.c
+++ b/drivers/i2c/busses/i2c-pca-platform.c
@@ -84,7 +84,7 @@ static int i2c_pca_pf_waitforcompletion(void *pd)
unsigned long timeout;
if (i2c->irq) {
- ret = wait_event_interruptible_timeout(i2c->wait,
+ ret = wait_event_timeout(i2c->wait,
i2c->algo_data.read_byte(i2c, I2C_PCA_CON)
& I2C_PCA_CON_SI, i2c->adap.timeout);
} else {
@@ -122,7 +122,7 @@ static irqreturn_t i2c_pca_pf_handler(int this_irq, void *dev_id)
if ((i2c->algo_data.read_byte(i2c, I2C_PCA_CON) & I2C_PCA_CON_SI) == 0)
return IRQ_NONE;
- wake_up_interruptible(&i2c->wait);
+ wake_up(&i2c->wait);
return IRQ_HANDLED;
}
--
1.6.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] i2c/pca: Don't use *_interruptible
[not found] ` <1263306460-24530-1-git-send-email-w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
@ 2010-01-12 15:35 ` Jean Delvare
0 siblings, 0 replies; 2+ messages in thread
From: Jean Delvare @ 2010-01-12 15:35 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA
On Tue, 12 Jan 2010 15:27:40 +0100, Wolfram Sang wrote:
> Unexpected signals can disturb the bus-handling and lock it up. Don't use
> interruptible in 'wait_event_*' and 'wake_*' as in commits
> dc1972d02747d2170fb1d78d114801f5ecb27506 (for cpm),
> 1ab082d7cbd0f34e39a5396cc6340c00bc5d66ef (for mpc),
> b7af349b175af45f9d87b3bf3f0a221e1831ed39 (for omap).
>
> Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
> Cc: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>
> ---
>
> Tested with custom hardware.
>
> drivers/i2c/busses/i2c-pca-isa.c | 4 ++--
> drivers/i2c/busses/i2c-pca-platform.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-pca-isa.c b/drivers/i2c/busses/i2c-pca-isa.c
> index 0ed68e2..f7346a9 100644
> --- a/drivers/i2c/busses/i2c-pca-isa.c
> +++ b/drivers/i2c/busses/i2c-pca-isa.c
> @@ -75,7 +75,7 @@ static int pca_isa_waitforcompletion(void *pd)
> unsigned long timeout;
>
> if (irq > -1) {
> - ret = wait_event_interruptible_timeout(pca_wait,
> + ret = wait_event_timeout(pca_wait,
> pca_isa_readbyte(pd, I2C_PCA_CON)
> & I2C_PCA_CON_SI, pca_isa_ops.timeout);
> } else {
> @@ -96,7 +96,7 @@ static void pca_isa_resetchip(void *pd)
> }
>
> static irqreturn_t pca_handler(int this_irq, void *dev_id) {
> - wake_up_interruptible(&pca_wait);
> + wake_up(&pca_wait);
> return IRQ_HANDLED;
> }
>
> diff --git a/drivers/i2c/busses/i2c-pca-platform.c b/drivers/i2c/busses/i2c-pca-platform.c
> index c4df9d4..5b2213d 100644
> --- a/drivers/i2c/busses/i2c-pca-platform.c
> +++ b/drivers/i2c/busses/i2c-pca-platform.c
> @@ -84,7 +84,7 @@ static int i2c_pca_pf_waitforcompletion(void *pd)
> unsigned long timeout;
>
> if (i2c->irq) {
> - ret = wait_event_interruptible_timeout(i2c->wait,
> + ret = wait_event_timeout(i2c->wait,
> i2c->algo_data.read_byte(i2c, I2C_PCA_CON)
> & I2C_PCA_CON_SI, i2c->adap.timeout);
> } else {
> @@ -122,7 +122,7 @@ static irqreturn_t i2c_pca_pf_handler(int this_irq, void *dev_id)
> if ((i2c->algo_data.read_byte(i2c, I2C_PCA_CON) & I2C_PCA_CON_SI) == 0)
> return IRQ_NONE;
>
> - wake_up_interruptible(&i2c->wait);
> + wake_up(&i2c->wait);
>
> return IRQ_HANDLED;
> }
Applied, thanks.
--
Jean Delvare
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-01-12 15:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-12 14:27 [PATCH] i2c/pca: Don't use *_interruptible Wolfram Sang
[not found] ` <1263306460-24530-1-git-send-email-w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2010-01-12 15:35 ` Jean Delvare
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).