3/34: block/DAC960: replace interruptible_sleep_on()
Subsystems (2)
PATCH 1/1 3/34: block/DAC960: replace interruptible_sleep_on()
Hi,
Please consider applying.
Description: Use wait_event_interruptible_timeout() instead of the deprecated interruptible_sleep_on_timeout(). The existing code is complicated in the conditional and so is the new code. Patch is compile-tested.
Signed-off-by Nishanth Aravamudan <[email protected]>
drivers/block/DAC960.c +8 -9
@@ -40,6 +40,7 @@#include <linux/timer.h> #include <linux/pci.h> #include <linux/init.h> +#include <linux/wait.h> #include <asm/io.h> #include <asm/uaccess.h> #include "DAC960.h"
@@ -6917,15 +6918,13 @@ static int DAC960_gam_ioctl(struct inode GetHealthStatus.HealthStatusBuffer, sizeof(DAC960_V2_HealthStatusBuffer_T)))return -EFAULT ; -while (Controller->V2.HealthStatusBuffer->StatusChangeCounter - == HealthStatusBuffer.StatusChangeCounter && - Controller->V2.HealthStatusBuffer->NextEventSequenceNumber - == HealthStatusBuffer.NextEventSequenceNumber) - { -interruptible_sleep_on_timeout (&Controller->HealthStatusWaitQueue, - DAC960_MonitoringTimerInterval); -if (signal_pending (current))return -EINTR ; - } +wait_event_interruptible_timeout (Controller->HealthStatusWaitQueue, + (Controller->V2.HealthStatusBuffer->StatusChangeCounter + != HealthStatusBuffer.StatusChangeCounter || + Controller->V2.HealthStatusBuffer->NextEventSequenceNumber + != HealthStatusBuffer.NextEventSequenceNumber), + DAC960_MonitoringTimerInterval); +if (signal_pending (current))return -EINTR ;if (copy_to_user (GetHealthStatus.HealthStatusBuffer, Controller->V2.HealthStatusBuffer,sizeof (DAC960_V2_HealthStatusBuffer_T)))
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors