Skip to contentSkip to conversation

isdn/icn: change units of ICN_BOOT_TIMEOUT1

Kernel-janitors Domen Puncer 2 participants 2 messages Sep 18, 2004 – Sep 20, 2004 Kernel janitors

lore
Share & tools
lore
#0 lore raw
Quoted 13 lines · Nishanth Aravamudan

Any comments would be appreciated. This is a re-push of a patch submitted a few months ago which has not been merged as of 2.6.9-rc1-mm5 / 2.6.9-rc2.

Description: Change units of ICN_BOOT_TIMEOUT1 to msecs instead of jiffies for msleep_interruptible() in icn.c. Also, remove unused constant ICN_CHANLOCK_DELAY.

drivers/isdn/icn/icn.h typedef struct icn_cdef { · line 73

Quoted 6 lines
drivers/isdn/icn/icn.h +1 -2
@@ -70,8 +70,7 @@ typedef struct icn_cdef {
 #define ICN_FLAGS_RUNNING  4    /* Cards driver activated                  */
 #define ICN_FLAGS_RBTIMER  8    /* cyclic scheduling of B-Channel-poll     */
 
-#define ICN_BOOT_TIMEOUT1  (HZ) /* Delay for Boot-download (jiffies)       */
-#define ICN_CHANLOCK_DELAY (HZ/10)	/* Delay for Channel-mapping (jiffies)     */
+#define ICN_BOOT_TIMEOUT1  (1000) /* Delay for Boot-download (jiffies)       */

Change comment to msecs too.

And some nitpicking: :-)
Numbers in defines don't have to be in ()'s.
Also, code seem to have formated "*/", your patch breaks it.

Quoted 7 lines
drivers/isdn/icn/icn.h +0 -0
 #define ICN_TIMER_BCREAD (HZ/100)	/* B-Channel poll-cycle                    */
 #define ICN_TIMER_DCREAD (HZ/2) /* D-Channel poll-cycle                    */
 

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

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

#1 lore raw
Quoted 23 lines · Domen Puncer
Quoted 13 lines · Nishanth Aravamudan

Any comments would be appreciated. This is a re-push of a patch submitted a few months ago which has not been merged as of 2.6.9-rc1-mm5 / 2.6.9-rc2.

Description: Change units of ICN_BOOT_TIMEOUT1 to msecs instead of jiffies for msleep_interruptible() in icn.c. Also, remove unused constant ICN_CHANLOCK_DELAY.

drivers/isdn/icn/icn.h typedef struct icn_cdef { · line 73

Quoted 6 lines
drivers/isdn/icn/icn.h +1 -2
@@ -70,8 +70,7 @@ typedef struct icn_cdef {
 #define ICN_FLAGS_RUNNING  4    /* Cards driver activated                  */
 #define ICN_FLAGS_RBTIMER  8    /* cyclic scheduling of B-Channel-poll     */
 
-#define ICN_BOOT_TIMEOUT1  (HZ) /* Delay for Boot-download (jiffies)       */
-#define ICN_CHANLOCK_DELAY (HZ/10)	/* Delay for Channel-mapping (jiffies)     */
+#define ICN_BOOT_TIMEOUT1  (1000) /* Delay for Boot-download (jiffies)       */

Change comment to msecs too.

Quoted 3 lines

And some nitpicking: :-)
Numbers in defines don't have to be in ()'s.
Also, code seem to have formated "*/", your patch breaks it.

Please find the corrected patch below. Thanks, Domen!

drivers/isdn/icn/icn.h +1 -2
@@ -70,8 +70,7 @@ typedef struct icn_cdef {
 #define ICN_FLAGS_RUNNING  4    /* Cards driver activated                  */
 #define ICN_FLAGS_RBTIMER  8    /* cyclic scheduling of B-Channel-poll     */
 
-#define ICN_BOOT_TIMEOUT1  (HZ) /* Delay for Boot-download (jiffies)       */
-#define ICN_CHANLOCK_DELAY (HZ/10)	/* Delay for Channel-mapping (jiffies)     */
+#define ICN_BOOT_TIMEOUT1  1000 /* Delay for Boot-download (msecs)         */
 
 #define ICN_TIMER_BCREAD (HZ/100)	/* B-Channel poll-cycle                    */
 #define ICN_TIMER_DCREAD (HZ/2) /* D-Channel poll-cycle                    */

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