Re: [PATCH] floppy.c #defines

[Jeff Garzik <jgarzik@mandrakesoft.com>]

Zwane Mwaikambo wrote:
> 
> There was more but, all in all floppy.c is a strange place...
> 
> Regards,
>         Zwane
> 
> diffed against 2.5.1-pre5
> 
> diff -urN linux-2.5.1-pre5/drivers/block/floppy.c linux-2.5.1-pre5-test/drivers/block/floppy.c
> --- linux-2.5.1-pre5/drivers/block/floppy.c     Sun Dec  2 12:57:38 2001
> +++ linux-2.5.1-pre5-test/drivers/block/floppy.c        Sun Dec  2 12:58:44 2001
> @@ -496,7 +496,7 @@
> 
>  #define NO_SIGNAL (!interruptible || !signal_pending(current))
>  #define CALL(x) if ((x) == -EINTR) return -EINTR
> -#define ECALL(x) if ((ret = (x))) return ret;
> +#define ECALL(x) if ((ret = (x))) return ret
>  #define _WAIT(x,i) CALL(ret=wait_til_done((x),i))
>  #define WAIT(x) _WAIT((x),interruptible)
>  #define IWAIT(x) _WAIT((x),1)
> @@ -670,7 +670,7 @@
>         else
>                 return b;
>  }
> -#define INFBOUND(a,b) (a)=maximum((a),(b));
> +#define INFBOUND(a,b) (a)=maximum((a),(b))
> 
>  static int minimum(int a, int b)
>  {
> @@ -679,7 +679,7 @@
>         else
>                 return b;
>  }
> -#define SUPBOUND(a,b) (a)=minimum((a),(b));
> +#define SUPBOUND(a,b) (a)=minimum((a),(b))

the driver should be changed to use standard min/max/min_t/max_t, and
from there you can create a single BOUND macro.

-- 
Jeff Garzik      | Only so many songs can be sung
Building 1024    | with two lips, two lungs, and one tongue.
MandrakeSoft     |         - nomeansno