lkml.org 
[lkml]   [2001]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] floppy.c #defines
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:
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:13    [W:0.057 / U:0.796 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site