From khali@linux-fr.org Wed Jan 18 13:51:19 2006 Date: Wed, 18 Jan 2006 22:52:06 +0100 From: Jean Delvare To: Greg KH Cc: Ben Gardner Subject: [PATCH 07/17] i2c: scx200_acb fix and speed up the poll loop Message-Id: <20060118225206.50e42a42.khali@linux-fr.org> Content-Disposition: inline; filename=i2c-scx200_acb-06-poll.patch From: Ben Gardner scx200_acb: Fix and speed up the poll loop Signed-off-by: Ben Gardner Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman --- drivers/i2c/busses/scx200_acb.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) --- gregkh-2.6.orig/drivers/i2c/busses/scx200_acb.c +++ gregkh-2.6/drivers/i2c/busses/scx200_acb.c @@ -47,10 +47,7 @@ static int base[MAX_DEVICES] = { 0x820, module_param_array(base, int, NULL, 0); MODULE_PARM_DESC(base, "Base addresses for the ACCESS.bus controllers"); -/* The hardware supports interrupt driven mode too, but I haven't - implemented that. */ -#define POLLED_MODE 1 -#define POLL_TIMEOUT (HZ) +#define POLL_TIMEOUT (HZ/5) enum scx200_acb_state { state_idle, @@ -222,7 +219,6 @@ static void scx200_acb_machine(struct sc iface->needs_reset = 1; } -#ifdef POLLED_MODE static void scx200_acb_poll(struct scx200_acb_iface *iface) { u8 status; @@ -235,7 +231,7 @@ static void scx200_acb_poll(struct scx20 scx200_acb_machine(iface, status); return; } - msleep(10); + yield(); } dev_err(&iface->adapter.dev, "timeout in state %s\n", @@ -245,7 +241,6 @@ static void scx200_acb_poll(struct scx20 iface->result = -EIO; iface->needs_reset = 1; } -#endif /* POLLED_MODE */ static void scx200_acb_reset(struct scx200_acb_iface *iface) { @@ -335,12 +330,8 @@ static s32 scx200_acb_smbus_xfer(struct else iface->state = state_address; -#ifdef POLLED_MODE while (iface->state != state_idle) scx200_acb_poll(iface); -#else /* POLLED_MODE */ -#error Interrupt driven mode not implemented -#endif /* POLLED_MODE */ if (iface->needs_reset) scx200_acb_reset(iface);