misc: tifm: match return type of wait_for_completion_timeout
authorNicholas Mc Guire <hofrat@osadl.org>
Mon, 9 Feb 2015 19:43:44 +0000 (14:43 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 Mar 2015 10:36:38 +0000 (11:36 +0100)
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>
drivers/misc/tifm_7xx1.c

index a606c8901e1859099bf387e8a7d1f8b07b0f3cd0..a37a42f67088fada76104cf3d988d98f34aca3b7 100644 (file)
@@ -236,6 +236,7 @@ static int tifm_7xx1_resume(struct pci_dev *dev)
 {
        struct tifm_adapter *fm = pci_get_drvdata(dev);
        int rc;
+       unsigned long timeout;
        unsigned int good_sockets = 0, bad_sockets = 0;
        unsigned long flags;
        unsigned char new_ids[fm->num_sockets];
@@ -272,8 +273,8 @@ static int tifm_7xx1_resume(struct pci_dev *dev)
        if (good_sockets) {
                fm->finish_me = &finish_resume;
                spin_unlock_irqrestore(&fm->lock, flags);
-               rc = wait_for_completion_timeout(&finish_resume, HZ);
-               dev_dbg(&dev->dev, "wait returned %d\n", rc);
+               timeout = wait_for_completion_timeout(&finish_resume, HZ);
+               dev_dbg(&dev->dev, "wait returned %lu\n", timeout);
                writel(TIFM_IRQ_FIFOMASK(good_sockets)
                       | TIFM_IRQ_CARDMASK(good_sockets),
                       fm->addr + FM_CLEAR_INTERRUPT_ENABLE);