[PATCH] floppy.c #defines

public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH] floppy.c #defines
@ 2001-12-02 12:03 Zwane Mwaikambo
  2001-12-02 12:14 ` Jeff Garzik
  0 siblings, 1 reply; 6+ messages in thread
From: Zwane Mwaikambo @ 2001-12-02 12:03 UTC (permalink / raw)
  To: Linux Kernel; +Cc: bsdlite5

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))


 /*
@@ -899,7 +899,7 @@
 #define lock_fdc(drive,interruptible) _lock_fdc(drive,interruptible, __LINE__)

 #define LOCK_FDC(drive,interruptible) \
-if (lock_fdc(drive,interruptible)) return -EINTR;
+if (lock_fdc(drive,interruptible)) return -EINTR


 /* unlocks the driver */
@@ -3506,7 +3506,7 @@
 	/* copyin */
 	CLEARSTRUCT(&inparam);
 	if (_IOC_DIR(cmd) & _IOC_WRITE)
-		ECALL(fd_copyin((void *)param, &inparam, size))
+		ECALL(fd_copyin((void *)param, &inparam, size));

 	switch (cmd) {
 		case FDEJECT:


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] floppy.c #defines
  2001-12-02 12:03 [PATCH] floppy.c #defines Zwane Mwaikambo
@ 2001-12-02 12:14 ` Jeff Garzik
  2001-12-02 13:28   ` Zwane Mwaikambo
  0 siblings, 1 reply; 6+ messages in thread
From: Jeff Garzik @ 2001-12-02 12:14 UTC (permalink / raw)
  To: Zwane Mwaikambo; +Cc: Linux Kernel, bsdlite5

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


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] floppy.c #defines
  2001-12-02 12:14 ` Jeff Garzik
@ 2001-12-02 13:28   ` Zwane Mwaikambo
  2001-12-02 13:25     ` Jeff Garzik
  2001-12-02 13:59     ` Eric Lammerts
  0 siblings, 2 replies; 6+ messages in thread
From: Zwane Mwaikambo @ 2001-12-02 13:28 UTC (permalink / raw)
  To: Jeff Garzik; +Cc: Linux Kernel


--- linux-2.5.1-pre5/drivers/block/floppy.c	Sun Dec  2 14:26:22 2001
+++ linux-2.5.1-pre5-test/drivers/block/floppy.c	Sun Dec  2 15:25:07 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)
@@ -663,23 +663,8 @@
 	timeout_message = message;
 }

-static int maximum(int a, int b)
-{
-	if (a > b)
-		return a;
-	else
-		return b;
-}
-#define INFBOUND(a,b) (a)=maximum((a),(b));
-
-static int minimum(int a, int b)
-{
-	if (a < b)
-		return a;
-	else
-		return b;
-}
-#define SUPBOUND(a,b) (a)=minimum((a),(b));
+#define INFBOUND(a,b) (a)=max((a),(b))
+#define SUPBOUND(a,b) (a)=min((a),(b))


 /*
@@ -2474,12 +2459,12 @@
 	int size;

 	max_sector = transfer_size(ssize,
-				   minimum(max_sector, max_sector_2),
+				   min(max_sector, max_sector_2),
 				   CURRENT->nr_sectors);

 	if (current_count_sectors <= 0 && CT(COMMAND) == FD_WRITE &&
 	    buffer_max > fsector_t + CURRENT->nr_sectors)
-		current_count_sectors = minimum(buffer_max - fsector_t,
+		current_count_sectors = min(buffer_max - fsector_t,
 						CURRENT->nr_sectors);

 	remaining = current_count_sectors << 9;
@@ -2497,7 +2482,7 @@
 	}
 #endif

-	buffer_max = maximum(max_sector, buffer_max);
+	buffer_max = max(max_sector, buffer_max);

 	dma_buffer = floppy_track_buffer + ((fsector_t - buffer_min) << 9);

@@ -2653,7 +2638,7 @@
 	if ((_floppy->rate & FD_2M) && (!TRACK) && (!HEAD)){
 		max_sector = 2 * _floppy->sect / 3;
 		if (fsector_t >= max_sector){
-			current_count_sectors = minimum(_floppy->sect - fsector_t,
+			current_count_sectors = min(_floppy->sect - fsector_t,
 							CURRENT->nr_sectors);
 			return 1;
 		}
@@ -3506,7 +3491,7 @@
 	/* copyin */
 	CLEARSTRUCT(&inparam);
 	if (_IOC_DIR(cmd) & _IOC_WRITE)
-		ECALL(fd_copyin((void *)param, &inparam, size))
+		ECALL(fd_copyin((void *)param, &inparam, size));

 	switch (cmd) {
 		case FDEJECT:


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] floppy.c #defines
  2001-12-02 13:28   ` Zwane Mwaikambo
@ 2001-12-02 13:25     ` Jeff Garzik
  2001-12-02 13:59     ` Eric Lammerts
  1 sibling, 0 replies; 6+ messages in thread
From: Jeff Garzik @ 2001-12-02 13:25 UTC (permalink / raw)
  To: Zwane Mwaikambo; +Cc: Linux Kernel

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


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] floppy.c #defines
  2001-12-02 13:28   ` Zwane Mwaikambo
  2001-12-02 13:25     ` Jeff Garzik
@ 2001-12-02 13:59     ` Eric Lammerts
  2001-12-02 14:32       ` Zwane Mwaikambo
  1 sibling, 1 reply; 6+ messages in thread
From: Eric Lammerts @ 2001-12-02 13:59 UTC (permalink / raw)
  To: Zwane Mwaikambo; +Cc: Jeff Garzik, Linux Kernel


On Sun, 2 Dec 2001, Zwane Mwaikambo wrote:

> -#define ECALL(x) if ((ret = (x))) return ret;
> +#define ECALL(x) if ((ret = (x))) return ret

To prevent a dangling else problem, better make that

#define ECALL(x) do { if ((ret = (x))) return ret; } while(0)

Eric


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] floppy.c #defines
  2001-12-02 13:59     ` Eric Lammerts
@ 2001-12-02 14:32       ` Zwane Mwaikambo
  0 siblings, 0 replies; 6+ messages in thread
From: Zwane Mwaikambo @ 2001-12-02 14:32 UTC (permalink / raw)
  To: Eric Lammerts; +Cc: Jeff Garzik, Linux Kernel

On Sun, 2 Dec 2001, Eric Lammerts wrote:

>
> On Sun, 2 Dec 2001, Zwane Mwaikambo wrote:
>
> > -#define ECALL(x) if ((ret = (x))) return ret;
> > +#define ECALL(x) if ((ret = (x))) return ret
>
> To prevent a dangling else problem, better make that
>
> #define ECALL(x) do { if ((ret = (x))) return ret; } while(0)
>
> Eric
>

hmm in that case, there are all sorts of other ones in there... Most
of them are for cutting down on typing instead of an internal API of
sorts.

--- linux-2.5.1-pre5/drivers/block/floppy.c	Sun Dec  2 14:26:22 2001
+++ linux-2.5.1-pre5-test/drivers/block/floppy.c	Sun Dec  2 16:26:56 2001
@@ -495,8 +495,8 @@
 static DECLARE_WAIT_QUEUE_HEAD(command_done);

 #define NO_SIGNAL (!interruptible || !signal_pending(current))
-#define CALL(x) if ((x) == -EINTR) return -EINTR
-#define ECALL(x) if ((ret = (x))) return ret;
+#define CALL(x) do {if ((x) == -EINTR) return -EINTR;} while(0)
+#define ECALL(x) do {if ((ret = (x))) return ret;} while(0)
 #define _WAIT(x,i) CALL(ret=wait_til_done((x),i))
 #define WAIT(x) _WAIT((x),interruptible)
 #define IWAIT(x) _WAIT((x),1)
@@ -549,7 +549,7 @@
  * reset doesn't need to be tested before sending commands, because
  * output_byte is automatically disabled when reset is set.
  */
-#define CHECK_RESET { if (FDCS->reset){ reset_fdc(); return; } }
+#define CHECK_RESET do { if (FDCS->reset){ reset_fdc(); return; } } while(0)
 static void reset_fdc(void);

 /*
@@ -663,23 +663,8 @@
 	timeout_message = message;
 }

-static int maximum(int a, int b)
-{
-	if (a > b)
-		return a;
-	else
-		return b;
-}
-#define INFBOUND(a,b) (a)=maximum((a),(b));
-
-static int minimum(int a, int b)
-{
-	if (a < b)
-		return a;
-	else
-		return b;
-}
-#define SUPBOUND(a,b) (a)=minimum((a),(b));
+#define INFBOUND(a,b) ((a)=max((a),(b)))
+#define SUPBOUND(a,b) ((a)=min((a),(b)))


 /*
@@ -899,7 +884,7 @@
 #define lock_fdc(drive,interruptible) _lock_fdc(drive,interruptible, __LINE__)

 #define LOCK_FDC(drive,interruptible) \
-if (lock_fdc(drive,interruptible)) return -EINTR;
+do {if (lock_fdc(drive,interruptible)) return -EINTR;} while(0)


 /* unlocks the driver */
@@ -1176,7 +1161,7 @@
 	}
 	return -1;
 }
-#define LAST_OUT(x) if (output_byte(x)<0){ reset_fdc();return;}
+#define LAST_OUT(x) do {if (output_byte(x)<0){ reset_fdc();return;}} while(0)

 /* gets the response from the fdc */
 static int result(void)
@@ -2474,12 +2459,12 @@
 	int size;

 	max_sector = transfer_size(ssize,
-				   minimum(max_sector, max_sector_2),
+				   min(max_sector, max_sector_2),
 				   CURRENT->nr_sectors);

 	if (current_count_sectors <= 0 && CT(COMMAND) == FD_WRITE &&
 	    buffer_max > fsector_t + CURRENT->nr_sectors)
-		current_count_sectors = minimum(buffer_max - fsector_t,
+		current_count_sectors = min(buffer_max - fsector_t,
 						CURRENT->nr_sectors);

 	remaining = current_count_sectors << 9;
@@ -2497,7 +2482,7 @@
 	}
 #endif

-	buffer_max = maximum(max_sector, buffer_max);
+	buffer_max = max(max_sector, buffer_max);

 	dma_buffer = floppy_track_buffer + ((fsector_t - buffer_min) << 9);

@@ -2653,7 +2638,7 @@
 	if ((_floppy->rate & FD_2M) && (!TRACK) && (!HEAD)){
 		max_sector = 2 * _floppy->sect / 3;
 		if (fsector_t >= max_sector){
-			current_count_sectors = minimum(_floppy->sect - fsector_t,
+			current_count_sectors = min(_floppy->sect - fsector_t,
 							CURRENT->nr_sectors);
 			return 1;
 		}
@@ -3506,7 +3491,7 @@
 	/* copyin */
 	CLEARSTRUCT(&inparam);
 	if (_IOC_DIR(cmd) & _IOC_WRITE)
-		ECALL(fd_copyin((void *)param, &inparam, size))
+		ECALL(fd_copyin((void *)param, &inparam, size));

 	switch (cmd) {
 		case FDEJECT:


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2001-12-02 14:28 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2001-12-02 12:03 [PATCH] floppy.c #defines Zwane Mwaikambo
2001-12-02 12:14 ` Jeff Garzik
2001-12-02 13:28   ` Zwane Mwaikambo
2001-12-02 13:25     ` Jeff Garzik
2001-12-02 13:59     ` Eric Lammerts
2001-12-02 14:32       ` Zwane Mwaikambo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox