Skip to contentSkip to conversation

PATCH: rio driver rework continued #3

PATCH Alan Cox 1 participant 1 message Mar 15, 2006 Char and misc drivers

lore
Share & tools
lore

Alan Cox

author
#0 lore raw

Second large chunk of code cleanup. The split between this and #3 and #4 is fairly arbitary and due to the message length limit on the list. These patches continue the process of ripping out macros and typedefs while cleaning up lots of 32bit assumptions. Several inlines for compatibility also get removed and that causes a lot of noise.

drivers/char/rio/cmdblk.h +2 -2
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.16-rc6-mm1/drivers/char/rio/cmdblk.h linux-2.6.16-rc6-mm1/drivers/char/rio/cmdblk.h
@@ -48,10 +48,10 @@
 	struct CmdBlk *NextP;	/* Pointer to next command block */
 	struct PKT Packet;	/* A packet, to copy to the rup */
 	/* The func to call to check if OK */
-	int (*PreFuncP) (int, struct CmdBlk *);
+	int (*PreFuncP) (unsigned long, struct CmdBlk *);
 	int PreArg;		/* The arg for the func */
 	/* The func to call when completed */
-	int (*PostFuncP) (int, struct CmdBlk *);
+	int (*PostFuncP) (unsigned long, struct CmdBlk *);
 	int PostArg;		/* The arg for the func */
 };
 
drivers/char/rio/func.h +25 -26

111 lines not on this page · raw message

drivers/char/rio/riocmd.c +68 -74

422 lines not on this page · raw message

drivers/char/rio/rio.h +2 -2
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.16-rc6-mm1/drivers/char/rio/rio.h linux-2.6.16-rc6-mm1/drivers/char/rio/rio.h
@@ -186,8 +186,8 @@
 **	RIO_OBJ takes hostp->Caddr and a UNIX pointer to an object and
 **	returns the offset into the DP RAM area.
 */
-#define	RIO_PTR(C,O) (((caddr_t)(C))+(0xFFFF&(O)))
-#define	RIO_OFF(C,O) ((int)(O)-(int)(C))
+#define	RIO_PTR(C,O) (((unsigned char *)(C))+(0xFFFF&(O)))
+#define	RIO_OFF(C,O) ((long)(O)-(long)(C))
 
 /*
 **	How to convert from various different device number formats:
drivers/char/rio/rioinit.c +76 -110

327 lines not on this page · raw message

drivers/char/rio/riointr.c +35 -276

420 lines not on this page · raw message

drivers/char/rio/rio_linux.c +24 -45

170 lines not on this page · raw message