Skip to contentSkip to conversation

- pxafb should use msleep

PATCH In review Chuck Short 2 participants 3 messages May 23, 2005 – May 24, 2005

Subsystems (2)
Kernel janitors Framebuffer layer
lore
Share & tools
lore

Chuck Short

author
#0 lore raw

PATCH 1/1 - pxafb should use msleep

Hi,

This patch changes pxafb to use msleep.

Signed-of-by Chuck Short <[email protected]>
drivers/video/pxafb.c +1 -2
diff -Naur linux-source-2.6.12-2.6.11.92.orig/drivers/video/pxafb.c linux-source-2.6.12-2.6.11.92/drivers/video/pxafb.c
@@ -740,14 +740,13 @@
 
 	DPRINTK("Disabling LCD controller\n");
 
-	set_current_state(TASK_UNINTERRUPTIBLE);
 	add_wait_queue(&fbi->ctrlr_wait, &wait);
 
 	LCSR = 0xffffffff;	/* Clear LCD Status Register */
 	LCCR0 &= ~LCCR0_LDM;	/* Enable LCD Disable Done Interrupt */
 	LCCR0 |= LCCR0_DIS;	/* Disable LCD Controller */
 
-	schedule_timeout(20 * HZ / 1000);
+	msleep(20);
 	remove_wait_queue(&fbi->ctrlr_wait, &wait);
 }

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#1 lore raw

PATCH 1/1 - pxafb should use msleep

Hi,

This patch changes pxafb to use msleep.

Signed-of-by Chuck Short <[email protected]>
drivers/video/pxafb.c +1 -2
diff -Naur linux-source-2.6.12-2.6.11.92.orig/drivers/video/pxafb.c linux-source-2.6.12-2.6.11.92/drivers/video/pxafb.c
@@ -740,14 +740,13 @@
 
 	DPRINTK("Disabling LCD controller\n");
 
-	set_current_state(TASK_UNINTERRUPTIBLE);
 	add_wait_queue(&fbi->ctrlr_wait, &wait);
 
 	LCSR = 0xffffffff;	/* Clear LCD Status Register */
 	LCCR0 &= ~LCCR0_LDM;	/* Enable LCD Disable Done Interrupt */
 	LCCR0 |= LCCR0_DIS;	/* Disable LCD Controller */
 
-	schedule_timeout(20 * HZ / 1000);
+	msleep(20);
 	remove_wait_queue(&fbi->ctrlr_wait, &wait);
 }

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

#2 lore raw
In reply to Chuck Short
Quoted 14 lines · Chuck Short

Hi,

This patch changes pxafb to use msleep.

Signed-of-by Chuck Short <[email protected]>

diff -Naur linux-source-2.6.12-2.6.11.92.orig/drivers/video/pxafb.c linux-source-2.6.12-2.6.11.92/drivers/video/pxafb.c

drivers/video/pxafb.c +0 -0
@@ -740,14 +740,13 @@
 
 	DPRINTK("Disabling LCD controller\n");

drivers/video/pxafb.c line 750

Quoted 10 lines
drivers/video/pxafb.c +1 -2
-	set_current_state(TASK_UNINTERRUPTIBLE);
 	add_wait_queue(&fbi->ctrlr_wait, &wait);
 
 	LCSR = 0xffffffff;	/* Clear LCD Status Register */
 	LCCR0 &= ~LCCR0_LDM;	/* Enable LCD Disable Done Interrupt */
 	LCCR0 |= LCCR0_DIS;	/* Disable LCD Controller */
 
-	schedule_timeout(20 * HZ / 1000);
+	msleep(20);
 	remove_wait_queue(&fbi->ctrlr_wait, &wait);

Sorry, but msleep() in not waitqueue friendly, it won't wake_up().

Domen

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors