[PATCH] scsi/a100u2w: Remove custom msecs_to_jiffies and jiffies_to_msecs macros

[PATCH] scsi/a100u2w: Remove custom msecs_to_jiffies and jiffies_to_msecs macros

[Tobias Klauser]

Replace the MS_TO_JIFFIES() macro with msecs_to_jiffies() from jiffies.h
The current macro is incorrect because HZ can have different values on
different architectures.
The patch also removes the JIFFIES_TO_MS() macro which is not used
anymore in the code.

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>

diff -urpN linux-2.6.12-rc2-mm3/drivers/scsi/a100u2w.c linux-2.6.12-rc2-mm3-tk/drivers/scsi/a100u2w.c
--- linux-2.6.12-rc2-mm3/drivers/scsi/a100u2w.c	2005-03-02 08:38:12.000000000 +0100
+++ linux-2.6.12-rc2-mm3-tk/drivers/scsi/a100u2w.c	2005-04-13 13:53:19.000000000 +0200
@@ -100,10 +100,6 @@
 
 #include "a100u2w.h"
 
-
-#define JIFFIES_TO_MS(t) ((t) * 1000 / HZ)
-#define MS_TO_JIFFIES(j) ((j * HZ) / 1000)
-
 static ORC_SCB *orc_alloc_scb(ORC_HCS * hcsp);
 static void inia100SCBPost(BYTE * pHcb, BYTE * pScb);
 
@@ -160,7 +156,7 @@ static UCHAR dftNvRam[64] =
 /***************************************************************************/
 static void waitForPause(unsigned amount)
 {
-	ULONG the_time = jiffies + MS_TO_JIFFIES(amount);
+	ULONG the_time = jiffies + msecs_to_jiffies(amount);
 	while (time_before_eq(jiffies, the_time))
 		cpu_relax();
 }

Re: [PATCH] scsi/a100u2w: Remove custom msecs_to_jiffies and jiffies_to_msecs macros

[Christoph Hellwig]

>  static void waitForPause(unsigned amount)
>  {
> -	ULONG the_time = jiffies + MS_TO_JIFFIES(amount);
> +	ULONG the_time = jiffies + msecs_to_jiffies(amount);
>  	while (time_before_eq(jiffies, the_time))
>  		cpu_relax();

You should probably replace this function with msleep completely.

[KJ] Re: [PATCH] scsi/a100u2w: Remove custom msecs_to_jiffies and jiffies_to_msecs macros

[Christoph Hellwig]

[-- Attachment #1: Type: text/plain, Size: 477 bytes --]

On Wed, Apr 13, 2005 at 03:43:08PM +0100, Christoph Hellwig wrote:
> >  static void waitForPause(unsigned amount)
> >  {
> > -	ULONG the_time = jiffies + MS_TO_JIFFIES(amount);
> > +	ULONG the_time = jiffies + msecs_to_jiffies(amount);
> >  	while (time_before_eq(jiffies, the_time))
> >  		cpu_relax();
> 
> You should probably replace this function with msleep completely.

I actually meant mdelay, but as mentioned in the other followup that might
need some more research.


[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

[KJ] Re: [PATCH] scsi/a100u2w: Remove custom msecs_to_jiffies and jiffies_to_msecs macros

[James Bottomley]

[-- Attachment #1: Type: text/plain, Size: 506 bytes --]

On Wed, 2005-04-13 at 15:51 +0100, Christoph Hellwig wrote:
> I actually meant mdelay, but as mentioned in the other followup that might
> need some more research.

Actually, several of the waits look as though they have user context and
so could sleep:

waitChipReady
waitFWReady
waitSCSIRSTdone

These I think are also user context: the aborts and nvram functions all
seem to be user context

waitHDOoff
waitHDIoff

So could someone with a board try the theory (that msleep will work)?

Thanks,

James



[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [PATCH] scsi/a100u2w: Remove custom msecs_to_jiffies and jiffies_to_msecs macros

[Tobias Klauser]

On Wed, Apr 13, 2005 at 03:51:00PM +0100, Christoph Hellwig wrote:
> On Wed, Apr 13, 2005 at 03:43:08PM +0100, Christoph Hellwig wrote:
> > >  static void waitForPause(unsigned amount)
> > >  {
> > > -	ULONG the_time = jiffies + MS_TO_JIFFIES(amount);
> > > +	ULONG the_time = jiffies + msecs_to_jiffies(amount);
> > >  	while (time_before_eq(jiffies, the_time))
> > >  		cpu_relax();
> > 
> > You should probably replace this function with msleep completely.
> 
> I actually meant mdelay, but as mentioned in the other followup that might
> need some more research.

OK, I'll have a look at it. Thanks for your help.

Re: [KJ] [PATCH] scsi/a100u2w: Remove custom msecs_to_jiffies and jiffies_to_msecs macros

[Alexey Dobriyan]

On Wednesday 13 April 2005 12:11, Tobias Klauser wrote:
> Replace the MS_TO_JIFFIES() macro with msecs_to_jiffies() from jiffies.h

> --- linux-2.6.12-rc2-mm3/drivers/scsi/a100u2w.c
> +++ linux-2.6.12-rc2-mm3-tk/drivers/scsi/a100u2w.c

>  static void waitForPause(unsigned amount)
>  {
> -	ULONG the_time = jiffies + MS_TO_JIFFIES(amount);
> +	ULONG the_time = jiffies + msecs_to_jiffies(amount);
>  	while (time_before_eq(jiffies, the_time))
>  		cpu_relax();
>  }

It'd be better to find out what is the equivalent generic sleeping/delaying
function and, if any, remove waitForPause() altogether.

However, Bas Vermeulen added these lines at the top of the file:

	* 01/31/99 bv - v1.02b Use mdelay instead of waitForPause
	* 08/08/99 bv - v1.02c Use waitForPause again.

Maybe he can recall what was wrong with mdelay().