[parisc-linux-cvs] linux varenet

[Thibaut VARENE]

This is a multi-part message in MIME format.

--Multipart_Sat__2_Aug_2003_21:35:04_+0200_102eaa60
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

On Sat,  2 Aug 2003 13:33:41 -0600 (MDT)
varenet@parisc-linux.org (Thibaut Varene) wrote:

> CVSROOT:	/var/cvs
> Module name:	linux
> Changes by:	varenet	03/08/02 13:33:41
> 
> Modified files:
> 	drivers/hil    : hil_kbd.c 
> 	drivers/net    : lasi_82596.c 
> 
> Log message:
> I will not put a declaration in the middle of a function.
> I will not put a declaration in the middle of a function.
> I will not put a declaration in the middle of a function.
> I will not put a declaration in the middle of a function.
> I will not put a declaration in the middle of a function.
> 



Thibaut VARENE
The PA/Linux ESIEE Team
http://pateam.esiee.fr/

--Multipart_Sat__2_Aug_2003_21:35:04_+0200_102eaa60
Content-Type: text/plain;
 name="c89.diff"
Content-Disposition: attachment;
 filename="c89.diff"
Content-Transfer-Encoding: 7bit

Index: drivers/hil/hil_kbd.c
===================================================================
RCS file: /var/cvs/linux/drivers/hil/hil_kbd.c,v
retrieving revision 1.10
diff -u -p -r1.10 hil_kbd.c
--- drivers/hil/hil_kbd.c	2 Aug 2003 19:05:51 -0000	1.10
+++ drivers/hil/hil_kbd.c	2 Aug 2003 19:30:35 -0000
@@ -40,6 +40,14 @@
 #include <linux/slab.h>
 #include <asm/keyboard.h>	/* unregister_kbd_ops() */
 
+
+#if 1
+	/* XXX: HACK !!!
+	 * remove this if hp_psaux.c/hp_keyb.c is converted
+	 * to the input layer, as well as others HACK occurences. */
+	extern void register_ps2_keybfuncs(void);	/* see char/hp_keyb.c */
+#endif
+
 #ifdef DEBUG	/* DEBUG */
 #undef input_report_key
 #define input_report_key(a,b,c) { printk("input_report_key(%p, %d, %d)\n", a, b, !!(c)); input_event(a, EV_KEY, b, !!(c)); }
@@ -404,7 +412,6 @@ static void hil_kbd_connect(struct serio
 	/* XXX: HACK !!!
 	 * remove this call if hp_psaux.c/hp_keyb.c is converted
 	 * to the input layer... */
-	void register_ps2_keybfuncs(void);	/* see char/hp_keyb.c */
 	register_ps2_keybfuncs();
 #endif
 	
Index: drivers/net/lasi_82596.c
===================================================================
RCS file: /var/cvs/linux/drivers/net/lasi_82596.c,v
retrieving revision 1.32
diff -u -p -r1.32 lasi_82596.c
--- drivers/net/lasi_82596.c	2 Aug 2003 18:36:34 -0000	1.32
+++ drivers/net/lasi_82596.c	2 Aug 2003 19:30:37 -0000
@@ -1166,29 +1166,29 @@ static int __devinit i82596_probe(struct
 
 	/* This lot is ensure things have been cache line aligned. */
 	if (sizeof(struct i596_rfd) != 32) {
-	    printk("82596: sizeof(struct i596_rfd) = %lu\n",
-			    (unsigned long)sizeof(struct i596_rfd));
+	    printk("82596: sizeof(struct i596_rfd) = %zu\n",
+			    sizeof(struct i596_rfd));
 	    return -ENODEV;
 	}
 	if ((sizeof(struct i596_rbd) % 32) != 0) {
-	    printk("82596: sizeof(struct i596_rbd) = %lu\n",
-			    (unsigned long)sizeof(struct i596_rbd));
+	    printk("82596: sizeof(struct i596_rbd) = %zu\n",
+			    sizeof(struct i596_rbd));
 	    return -ENODEV;
 	}
 	if ((sizeof(struct tx_cmd) % 32) != 0) {
-	    printk("82596: sizeof(struct tx_cmd) = %lu\n",
-			    (unsigned long)sizeof(struct tx_cmd));
+	    printk("82596: sizeof(struct tx_cmd) = %zu\n",
+			    sizeof(struct tx_cmd));
 	    return -ENODEV;
 	}
 	if (sizeof(struct i596_tbd) != 32) {
-	    printk("82596: sizeof(struct i596_tbd) = %lu\n",
-			    (unsigned long)sizeof(struct i596_tbd));
+	    printk("82596: sizeof(struct i596_tbd) = %zu\n",
+			    sizeof(struct i596_tbd));
 	    return -ENODEV;
 	}
 #ifndef __LP64__
 	if (sizeof(struct i596_private) > 4096) {
-	    printk("82596: sizeof(struct i596_private) = %lu\n",
-			    (unsigned long)sizeof(struct i596_private));
+	    printk("82596: sizeof(struct i596_private) = %zu\n",
+			    sizeof(struct i596_private));
 	    return -ENODEV;
 	}
 #endif
@@ -1238,9 +1238,9 @@ static int __devinit i82596_probe(struct
 	dev->priv = (void *)(dev->mem_start);
 
 	lp = (struct i596_private *) dev->priv;
-	DEB(DEB_INIT,printk ("%s: lp at 0x%08lx (%lu bytes), lp->scb at 0x%08lx\n",
+	DEB(DEB_INIT,printk ("%s: lp at 0x%08lx (%zu bytes), lp->scb at 0x%08lx\n",
 		dev->name, (unsigned long)lp,
-		(unsigned long)sizeof(struct i596_private), (unsigned long)&lp->scb));
+		sizeof(struct i596_private), (unsigned long)&lp->scb));
 	memset(lp, 0, sizeof(struct i596_private));
 
 	lp->scb.command = 0;

--Multipart_Sat__2_Aug_2003_21:35:04_+0200_102eaa60--