mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 16:15:11 +00:00
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>
This commit is contained in:
parent
1ac63fef05
commit
9bb9fee9e9
1 changed files with 2 additions and 2 deletions
|
@ -448,7 +448,7 @@ static int read_i2c(struct nmk_i2c_dev *dev, u16 flags)
|
||||||
{
|
{
|
||||||
u32 status = 0;
|
u32 status = 0;
|
||||||
u32 mcr, irq_mask;
|
u32 mcr, irq_mask;
|
||||||
int timeout;
|
unsigned long timeout;
|
||||||
|
|
||||||
mcr = load_i2c_mcr_reg(dev, flags);
|
mcr = load_i2c_mcr_reg(dev, flags);
|
||||||
writel(mcr, dev->virtbase + I2C_MCR);
|
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 status = 0;
|
||||||
u32 mcr, irq_mask;
|
u32 mcr, irq_mask;
|
||||||
int timeout;
|
unsigned long timeout;
|
||||||
|
|
||||||
mcr = load_i2c_mcr_reg(dev, flags);
|
mcr = load_i2c_mcr_reg(dev, flags);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue