]> git.hungrycats.org Git - linux/commitdiff
i2c: at91: don't account as iowait
authorWolfram Sang <wsa@the-dreams.de>
Mon, 3 Nov 2014 20:16:16 +0000 (21:16 +0100)
committerJiri Slaby <jslaby@suse.cz>
Thu, 13 Nov 2014 18:03:07 +0000 (19:03 +0100)
commit 11cfbfb098b22d3e57f1f2be217cad20e2d48463 upstream.

iowait is for blkio [1]. I2C shouldn't use it.

[1] https://lkml.org/lkml/2014/11/3/317

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/i2c/busses/i2c-at91.c

index 2f6d43bd072824934b68679cf6cbfc2ddf38ee61..174445303b9f8f3cda93420765ad62f61dec5617 100644 (file)
@@ -434,7 +434,7 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev)
                }
        }
 
-       ret = wait_for_completion_io_timeout(&dev->cmd_complete,
+       ret = wait_for_completion_timeout(&dev->cmd_complete,
                                             dev->adapter.timeout);
        if (ret == 0) {
                dev_err(dev->dev, "controller timed out\n");