From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nishanth Aravamudan Date: Mon, 20 Sep 2004 16:04:41 +0000 Subject: [Kernel-janitors] Re: isdn/icn: change units of ICN_BOOT_TIMEOUT1 Message-Id: <20040920160441.GA1898@us.ibm.com> MIME-Version: 1 Content-Type: multipart/mixed; boundary="===============84325768164182646==" List-Id: References: <20040918211325.GA3609@masina.coderock.org> In-Reply-To: <20040918211325.GA3609@masina.coderock.org> To: kernel-janitors@vger.kernel.org --===============84325768164182646== Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sat, Sep 18, 2004 at 11:13:25PM +0200, Domen Puncer wrote: > On 17/09/04 10:52 -0700, Nishanth Aravamudan wrote: > > 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. > > > > Signed-off-by: Nishanth Aravamudan > > > > --- 2.6.9-rc2-vanilla/drivers/isdn/icn/icn.h 2004-09-13 17:16:04.000000000 -0700 > > +++ 2.6.9-rc2/drivers/isdn/icn/icn.h 2004-09-17 10:43:35.000000000 -0700 > > @@ -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. Please find the corrected patch below. Thanks, Domen! --- 2.6.9-rc2-vanilla/drivers/isdn/icn/icn.h 2004-09-13 17:16:04.000000000 -0700 +++ 2.6.9-rc2/drivers/isdn/icn/icn.h 2004-09-20 09:00:16.000000000 -0700 @@ -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 */ --===============84325768164182646== Content-Type: text/plain; charset="iso-8859-1" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline _______________________________________________ Kernel-janitors mailing list Kernel-janitors@lists.osdl.org http://lists.osdl.org/mailman/listinfo/kernel-janitors --===============84325768164182646==--