* [PATCH 1/2] i2c: nomadik: match return type of wait_for_completion_timeout
@ 2015-02-08 12:34 Nicholas Mc Guire
2015-03-04 12:55 ` Linus Walleij
2015-03-15 10:02 ` Wolfram Sang
0 siblings, 2 replies; 3+ messages in thread
From: Nicholas Mc Guire @ 2015-02-08 12:34 UTC (permalink / raw)
To: Alessandro Rubini
Cc: Linus Walleij, Wolfram Sang, linux-arm-kernel, linux-i2c,
linux-kernel, Nicholas Mc Guire
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>
---
Patch was only compile tested with multi_v5_defconfig
(implies CONFIG_I2C_NOMADIK=y)
Patch is against 3.19.0-rc7 (localversion-next is -next-20150204)
drivers/i2c/busses/i2c-nomadik.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index 9799894..6ca6ad6 100644
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -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);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] i2c: nomadik: match return type of wait_for_completion_timeout
2015-02-08 12:34 [PATCH 1/2] i2c: nomadik: match return type of wait_for_completion_timeout Nicholas Mc Guire
@ 2015-03-04 12:55 ` Linus Walleij
2015-03-15 10:02 ` Wolfram Sang
1 sibling, 0 replies; 3+ messages in thread
From: Linus Walleij @ 2015-03-04 12:55 UTC (permalink / raw)
To: Nicholas Mc Guire
Cc: Alessandro Rubini, Wolfram Sang,
linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org,
linux-kernel@vger.kernel.org
On Sun, Feb 8, 2015 at 1:34 PM, Nicholas Mc Guire <hofrat@osadl.org> wrote:
> 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>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] i2c: nomadik: match return type of wait_for_completion_timeout
2015-02-08 12:34 [PATCH 1/2] i2c: nomadik: match return type of wait_for_completion_timeout Nicholas Mc Guire
2015-03-04 12:55 ` Linus Walleij
@ 2015-03-15 10:02 ` Wolfram Sang
1 sibling, 0 replies; 3+ messages in thread
From: Wolfram Sang @ 2015-03-15 10:02 UTC (permalink / raw)
To: Nicholas Mc Guire
Cc: Alessandro Rubini, Linus Walleij, linux-arm-kernel, linux-i2c,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 352 bytes --]
On Sun, Feb 08, 2015 at 07:34:33AM -0500, Nicholas Mc Guire wrote:
> 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>
Applied to for-next, thanks!
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-03-15 10:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-08 12:34 [PATCH 1/2] i2c: nomadik: match return type of wait_for_completion_timeout Nicholas Mc Guire
2015-03-04 12:55 ` Linus Walleij
2015-03-15 10:02 ` Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).