[PATCH] compiler warning fixes in 8139too.c

[PATCH] compiler warning fixes in 8139too.c

[Anuradha Ratnaweera]

The following patch fixes some warnings when 8139 driver is compiled
without 8129 support.

Regards,

Anuradha

----------------------------------
http://www.bee.lk/people/anuradha/


diff -rua linux-2.4.5/drivers/net/8139too.c linux/drivers/net/8139too.c
--- linux-2.4.5/drivers/net/8139too.c	Tue May 29 23:41:48 2001
+++ linux/drivers/net/8139too.c	Wed May 30 01:00:21 2001
@@ -1150,6 +1150,7 @@
 	0
 };
 
+#ifdef CONFIG_8139TOO_8129
 
 /* Syncronize the MII management interface by shifting 32 one bits out. */
 static void mdio_sync (void *mdio_addr)
@@ -1168,14 +1169,18 @@
 	DPRINTK ("EXIT\n");
 }
 
+#endif
 
 static int mdio_read (struct net_device *dev, int phy_id, int location)
 {
 	struct rtl8139_private *tp = dev->priv;
+	int retval = 0;
+
+#ifdef CONFIG_8139TOO_8129
 	void *mdio_addr = tp->mmio_addr + Config4;
 	int mii_cmd = (0xf6 << 10) | (phy_id << 5) | location;
-	int retval = 0;
 	int i;
+#endif
 
 	DPRINTK ("ENTER\n");
 
@@ -1216,9 +1221,12 @@
 			int value)
 {
 	struct rtl8139_private *tp = dev->priv;
+
+#ifdef CONFIG_8139TOO_8129
 	void *mdio_addr = tp->mmio_addr + Config4;
 	int mii_cmd = (0x5002 << 16) | (phy_id << 23) | (location << 18) | value;
 	int i;
+#endif
 
 	DPRINTK ("ENTER\n");
 

Re: [PATCH] compiler warning fixes in 8139too.c

[Andreas Dilger]

Anuradha writes:
> The following patch fixes some warnings when 8139 driver is compiled
> without 8129 support.

I've already submitted an improved patch to Jeff Garzik (8139too
maintainer) that fixes this issue and he will include along with other
fixes to the driver when he updates it next.

Cheers, Andreas
-- 
Andreas Dilger  \ "If a man ate a pound of pasta and a pound of antipasto,
                 \  would they cancel out, leaving him still hungry?"
http://www-mddsp.enel.ucalgary.ca/People/adilger/               -- Dogbert