X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/69ae98b46ec77c81215a3c334fd0f85df4888a4c..c3d057408613580da12a0d7c52b94f8864d9fa9b:/package/switch/src/switch-robo.c

diff --git a/package/switch/src/switch-robo.c b/package/switch/src/switch-robo.c
index b23fca644..009781dc0 100644
--- a/package/switch/src/switch-robo.c
+++ b/package/switch/src/switch-robo.c
@@ -20,7 +20,7 @@
  * 02110-1301, USA.
  */
 
-#include <linux/config.h>
+#include <linux/autoconf.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/if.h>
@@ -162,6 +162,7 @@ static int robo_reg(__u8 page, __u8 reg, __u8 op)
 	return 0;
 }
 
+/*
 static void robo_read(__u8 page, __u8 reg, __u16 *val, int count)
 {
 	int i;
@@ -171,6 +172,7 @@ static void robo_read(__u8 page, __u8 reg, __u16 *val, int count)
 	for (i = 0; i < count; i++)
 		val[i] = mdio_read(ROBO_PHY_ADDR, REG_MII_DATA0 + i);
 }
+*/
 
 static __u16 robo_read16(__u8 page, __u8 reg)
 {
@@ -205,7 +207,7 @@ static void robo_write32(__u8 page, __u8 reg, __u32 val32)
 }
 
 /* checks that attached switch is 5325E/5350 */
-static int robo_vlan5350()
+static int robo_vlan5350(void)
 {
 	/* set vlan access id to 15 and read it back */
 	__u16 val16 = 15;
@@ -219,8 +221,6 @@ static int robo_vlan5350()
 
 static int robo_probe(char *devname)
 {
-	struct ethtool_drvinfo info;
-	int i;
 	__u32 phyid;
 
 	printk("Probing device %s: ", devname);
@@ -231,12 +231,6 @@ static int robo_probe(char *devname)
 		return 1;
 	}
 
-	info.cmd = ETHTOOL_GDRVINFO;
-	if (do_ioctl(SIOCETHTOOL, (void *) &info) < 0) {
-		printk("SIOCETHTOOL: not supported\n");
-		return 1;
-	}
-	
 	/* try access using MII ioctls - get phy address */
 	if (do_ioctl(SIOCGMIIPHY, NULL) < 0) {
 		use_et = 1;
@@ -315,6 +309,8 @@ static int handle_vlan_port_read(void *driver, char *buf, int nr)
 		}
 	}
 
+	buf[len] = '\0';
+
 	return len;
 }
 
@@ -424,7 +420,7 @@ static int handle_reset(void *driver, char *buf, int nr)
 	return 0;
 }
 
-static int __init robo_init()
+static int __init robo_init(void)
 {
 	int notfound = 1;
 
@@ -464,7 +460,7 @@ static int __init robo_init()
 	}
 }
 
-static void __exit robo_exit()
+static void __exit robo_exit(void)
 {
 	switch_unregister_driver(DRIVER_NAME);
 	kfree(device);