Commit 9bb9fee9 authored Feb 08, 2015 by Nicholas Mc Guire Committed by Wolfram Sang Mar 15, 2015

i2c: nomadik: match return type of wait_for_completion_timeout



return type of wait_for_completion_timeout is unsigned long not int. as
timeout is used for wait_for_completion_timeout exclusively here its
type is simply changed to unsigned long.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

parent 1ac63fef

drivers/i2c/busses/i2c-nomadik.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -448,7 +448,7 @@ static int read_i2c(struct nmk_i2c_dev *dev, u16 flags)
		{
		u32 status = 0;
		u32 mcr, irq_mask;
		int timeout;
		unsigned long timeout;

		mcr = load_i2c_mcr_reg(dev, flags);
		writel(mcr, dev->virtbase + I2C_MCR);
		@@ -517,7 +517,7 @@ static int write_i2c(struct nmk_i2c_dev *dev, u16 flags)
		{
		u32 status = 0;
		u32 mcr, irq_mask;
		int timeout;
		unsigned long timeout;

		mcr = load_i2c_mcr_reg(dev, flags);