Skip to contentSkip to conversation

bluetooth: replace schedule_timeout() with

Kernel-janitors Domen Puncer 3 participants 4 messages Jul 20, 2004 – Jul 21, 2004

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

On 20/07/04 18:18 +0000, Nishanth Aravamudan wrote:
...

drivers/bluetooth/bluecard_cs.c int bluecard_open(bluecard_info_t *info) · line 779

Quoted 9 lines
drivers/bluetooth/bluecard_cs.c +1 -2
@@ -776,8 +776,7 @@ int bluecard_open(bluecard_info_t *info)
 	outb(0x80, iobase + 0x30);
 
 	/* Wait some time */
-	set_current_state(TASK_INTERRUPTIBLE);
-	schedule_timeout(HZ / 100);
+	msleep(100);

This should be 10.

Domen

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

#1 lore raw
Quoted 7 lines · Domen Puncer

On 20/07/04 18:18 +0000, Nishanth Aravamudan wrote:
...

Quoted 5 lines
drivers/bluetooth/bluecard_cs.c +0 -0
@@ -776,8 +776,7 @@ int bluecard_open(bluecard_info_t *info)
 	outb(0x80, iobase + 0x30);
 
Quoted 6 lines

drivers/bluetooth/bluecard_cs.c int bluecard_open(bluecard_info_t *info) · line 779

Quoted 4 lines
drivers/bluetooth/bluecard_cs.c +1 -2
 	/* Wait some time */
-	set_current_state(TASK_INTERRUPTIBLE);
-	schedule_timeout(HZ / 100);
+	msleep(100);

This should be 10.

Thanks, here is the corrected patch:

drivers/bluetooth/bluecard_cs.c +2 -4
@@ -776,8 +776,7 @@ int bluecard_open(bluecard_info_t *info)
 	outb(0x80, iobase + 0x30);
 
 	/* Wait some time */
-	set_current_state(TASK_INTERRUPTIBLE);
-	schedule_timeout(HZ / 100);
+	msleep(10);
 
 	/* Turn FPGA on */
 	outb(0x00, iobase + 0x30);
@@ -823,8 +822,7 @@ int bluecard_open(bluecard_info_t *info)
 	outb((0x0f << RTS_LEVEL_SHIFT_BITS) | 1, iobase + REG_RX_CONTROL);
 
 	/* Timeout before it is safe to send the first HCI packet */
-	set_current_state(TASK_INTERRUPTIBLE);
-	schedule_timeout((HZ * 5) / 4);		// or set it to 3/2
+	msleep(1250);
 
 	/* Register HCI device */
 	if (hci_register_dev(hdev) < 0) {

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

maintainer
#2 lore raw
In reply to Domen Puncer

Hi Nish,

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/bluetooth/bluecard_cs.c +0 -0
@@ -776,8 +776,7 @@ int bluecard_open(bluecard_info_t *info)
 	outb(0x80, iobase + 0x30);
 
Quoted 8 lines
Quoted 6 lines

drivers/bluetooth/bluecard_cs.c int bluecard_open(bluecard_info_t *info) · line 779

Quoted 4 lines
drivers/bluetooth/bluecard_cs.c +1 -2
 	/* Wait some time */
-	set_current_state(TASK_INTERRUPTIBLE);
-	schedule_timeout(HZ / 100);
+	msleep(100);

This should be 10.

Thanks, here is the corrected patch:

the patches are still wrong, because of warnings like this:

CC [M] drivers/bluetooth/bluecard_cs.o
drivers/bluetooth/bluecard_cs.c: In function `bluecard_open':
drivers/bluetooth/bluecard_cs.c:779: warning: implicit declaration of function `msleep'

I fixed these warnings and now I have to test if the cards are still working.

Regards

Marcel

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

#3 lore raw
In reply to Domen Puncer
Quoted 14 lines · Marcel Holtmann
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/bluetooth/bluecard_cs.c +0 -0
@@ -776,8 +776,7 @@ int bluecard_open(bluecard_info_t *info)
 	outb(0x80, iobase + 0x30);
 
Quoted 8 lines
Quoted 6 lines

drivers/bluetooth/bluecard_cs.c int bluecard_open(bluecard_info_t *info) · line 779

Quoted 4 lines
drivers/bluetooth/bluecard_cs.c +1 -2
 	/* Wait some time */
-	set_current_state(TASK_INTERRUPTIBLE);
-	schedule_timeout(HZ / 100);
+	msleep(100);

This should be 10.

Thanks, here is the corrected patch:

Quoted 7 lines

the patches are still wrong, because of warnings like this:

CC [M] drivers/bluetooth/bluecard_cs.o
drivers/bluetooth/bluecard_cs.c: In function `bluecard_open':
drivers/bluetooth/bluecard_cs.c:779: warning: implicit declaration of function `msleep'

I fixed these warnings and now I have to test if the cards are still working.

Thank you for notifying me of this. I thought I had caught all of these compile errors, but will now go back through and make sure before I release any more patches. Sorry for the inconvenience, but I'm learning.

-Nish

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