mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
[SCSI] fusion - mtctl - change to wait_event_timeout
Change from using wait_event_interruptible_timeout to wait_event_timeout. Also delete white space and duplicate line of code. Signed-off-by: Eric Moore <Eric.Moore@lsil.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
parent
9cc1cfbc67
commit
86a7dcaae9
1 changed files with 5 additions and 6 deletions
|
@ -385,18 +385,18 @@ static int mptctl_bus_reset(MPT_IOCTL *ioctl)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Now wait for the command to complete */
|
/* Now wait for the command to complete */
|
||||||
ii = wait_event_interruptible_timeout(mptctl_wait,
|
ii = wait_event_timeout(mptctl_wait,
|
||||||
ioctl->wait_done == 1,
|
ioctl->wait_done == 1,
|
||||||
HZ*5 /* 5 second timeout */);
|
HZ*5 /* 5 second timeout */);
|
||||||
|
|
||||||
if(ii <=0 && (ioctl->wait_done != 1 )) {
|
if(ii <=0 && (ioctl->wait_done != 1 )) {
|
||||||
|
mpt_free_msg_frame(hd->ioc, mf);
|
||||||
ioctl->wait_done = 0;
|
ioctl->wait_done = 0;
|
||||||
retval = -1; /* return failure */
|
retval = -1; /* return failure */
|
||||||
}
|
}
|
||||||
|
|
||||||
mptctl_bus_reset_done:
|
mptctl_bus_reset_done:
|
||||||
|
|
||||||
mpt_free_msg_frame(hd->ioc, mf);
|
|
||||||
mptctl_free_tm_flags(ioctl->ioc);
|
mptctl_free_tm_flags(ioctl->ioc);
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
@ -807,7 +807,7 @@ mptctl_do_fw_download(int ioc, char __user *ufwbuf, size_t fwlen)
|
||||||
mpt_put_msg_frame(mptctl_id, iocp, mf);
|
mpt_put_msg_frame(mptctl_id, iocp, mf);
|
||||||
|
|
||||||
/* Now wait for the command to complete */
|
/* Now wait for the command to complete */
|
||||||
ret = wait_event_interruptible_timeout(mptctl_wait,
|
ret = wait_event_timeout(mptctl_wait,
|
||||||
iocp->ioctl->wait_done == 1,
|
iocp->ioctl->wait_done == 1,
|
||||||
HZ*60);
|
HZ*60);
|
||||||
|
|
||||||
|
@ -1177,7 +1177,6 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)
|
||||||
karg->pciInfo.u.bits.busNumber = pdev->bus->number;
|
karg->pciInfo.u.bits.busNumber = pdev->bus->number;
|
||||||
karg->pciInfo.u.bits.deviceNumber = PCI_SLOT( pdev->devfn );
|
karg->pciInfo.u.bits.deviceNumber = PCI_SLOT( pdev->devfn );
|
||||||
karg->pciInfo.u.bits.functionNumber = PCI_FUNC( pdev->devfn );
|
karg->pciInfo.u.bits.functionNumber = PCI_FUNC( pdev->devfn );
|
||||||
karg->pciInfo.u.bits.functionNumber = PCI_FUNC( pdev->devfn );
|
|
||||||
karg->pciInfo.segmentID = pci_domain_nr(pdev->bus);
|
karg->pciInfo.segmentID = pci_domain_nr(pdev->bus);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2153,7 +2152,7 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr)
|
||||||
|
|
||||||
/* Now wait for the command to complete */
|
/* Now wait for the command to complete */
|
||||||
timeout = (karg.timeout > 0) ? karg.timeout : MPT_IOCTL_DEFAULT_TIMEOUT;
|
timeout = (karg.timeout > 0) ? karg.timeout : MPT_IOCTL_DEFAULT_TIMEOUT;
|
||||||
timeout = wait_event_interruptible_timeout(mptctl_wait,
|
timeout = wait_event_timeout(mptctl_wait,
|
||||||
ioc->ioctl->wait_done == 1,
|
ioc->ioctl->wait_done == 1,
|
||||||
HZ*timeout);
|
HZ*timeout);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue