diff options
author | Nicholas Mc Guire <hofrat@osadl.org> | 2015-02-09 14:43:44 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-25 06:36:38 -0400 |
commit | a819a228feae6f936e2696c4946c53f883a3d480 (patch) | |
tree | ff41ea66ddae08131c9e64e2d42307b904e78dc1 | |
parent | 03190c67ff72b5c56b24266762ab8abe68970f45 (diff) |
misc: tifm: match return type of wait_for_completion_timeout
return type of wait_for_completion_timeout is unsigned long not int. The
rc variable is in use for other calls so an additional timeout variable
of type unsigned long is added.
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/misc/tifm_7xx1.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/misc/tifm_7xx1.c b/drivers/misc/tifm_7xx1.c index a606c8901e18..a37a42f67088 100644 --- a/drivers/misc/tifm_7xx1.c +++ b/drivers/misc/tifm_7xx1.c | |||
@@ -236,6 +236,7 @@ static int tifm_7xx1_resume(struct pci_dev *dev) | |||
236 | { | 236 | { |
237 | struct tifm_adapter *fm = pci_get_drvdata(dev); | 237 | struct tifm_adapter *fm = pci_get_drvdata(dev); |
238 | int rc; | 238 | int rc; |
239 | unsigned long timeout; | ||
239 | unsigned int good_sockets = 0, bad_sockets = 0; | 240 | unsigned int good_sockets = 0, bad_sockets = 0; |
240 | unsigned long flags; | 241 | unsigned long flags; |
241 | unsigned char new_ids[fm->num_sockets]; | 242 | unsigned char new_ids[fm->num_sockets]; |
@@ -272,8 +273,8 @@ static int tifm_7xx1_resume(struct pci_dev *dev) | |||
272 | if (good_sockets) { | 273 | if (good_sockets) { |
273 | fm->finish_me = &finish_resume; | 274 | fm->finish_me = &finish_resume; |
274 | spin_unlock_irqrestore(&fm->lock, flags); | 275 | spin_unlock_irqrestore(&fm->lock, flags); |
275 | rc = wait_for_completion_timeout(&finish_resume, HZ); | 276 | timeout = wait_for_completion_timeout(&finish_resume, HZ); |
276 | dev_dbg(&dev->dev, "wait returned %d\n", rc); | 277 | dev_dbg(&dev->dev, "wait returned %lu\n", timeout); |
277 | writel(TIFM_IRQ_FIFOMASK(good_sockets) | 278 | writel(TIFM_IRQ_FIFOMASK(good_sockets) |
278 | | TIFM_IRQ_CARDMASK(good_sockets), | 279 | | TIFM_IRQ_CARDMASK(good_sockets), |
279 | fm->addr + FM_CLEAR_INTERRUPT_ENABLE); | 280 | fm->addr + FM_CLEAR_INTERRUPT_ENABLE); |