i2c: iop3xxx: fix build failure after waitqueue changes
authorKevin Hilman <khilman@linaro.org>
Fri, 28 Jun 2013 21:35:52 +0000 (14:35 -0700)
committerWolfram Sang <wsa@the-dreams.de>
Mon, 1 Jul 2013 05:48:58 +0000 (07:48 +0200)
There has long been a syntax problem in iop3xx_i2c_wait_event() which
has been somehow hidden by the macros in <linux/wait.h>.  After some
recent cleanup/rework of the wait_event_* helpers, the bug has come
out from hiding and now results in build failure:

/work/kernel/next/drivers/i2c/busses/i2c-iop3xx.c: In function 'iop3xx_i2c_wait_event':
/work/kernel/next/drivers/i2c/busses/i2c-iop3xx.c:176:143: error: expected ')' before ';' token
/work/kernel/next/drivers/i2c/busses/i2c-iop3xx.c:176:157: error: expected ')' before ';' token
/work/kernel/next/drivers/i2c/busses/i2c-iop3xx.c:176:213: error: expected ')' before ';' token
/work/kernel/next/drivers/i2c/busses/i2c-iop3xx.c:176:291: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
/work/kernel/next/drivers/i2c/busses/i2c-iop3xx.c:176:551: error: expected ')' before ';' token
/work/kernel/next/drivers/i2c/busses/i2c-iop3xx.c:176:565: error: expected ')' before ';' token
/work/kernel/next/drivers/i2c/busses/i2c-iop3xx.c:176:764: error: expected ')' before ';' token
/work/kernel/next/drivers/i2c/busses/i2c-iop3xx.c:176:778: error: expected ')' b

Fix by removing stray ';'

Signed-off-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/busses/i2c-iop3xx.c

index bc99333..dd24aa0 100644 (file)
@@ -176,7 +176,7 @@ iop3xx_i2c_wait_event(struct i2c_algo_iop3xx_data *iop3xx_adap,
                interrupted = wait_event_interruptible_timeout (
                        iop3xx_adap->waitq,
                        (done = compare( sr = iop3xx_i2c_get_srstat(iop3xx_adap) ,flags )),
-                       1 * HZ;
+                       1 * HZ
                        );
                if ((rc = iop3xx_i2c_error(sr)) < 0) {
                        *status = sr;