X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2fbb0f0be3175485b7a37af4bdb070da9ff42f2d..7b3bd12cf8ee18257abac8deb8c5854070569fdf:/package/switch/src/switch-robo.c

diff --git a/package/switch/src/switch-robo.c b/package/switch/src/switch-robo.c
index 9f0689602..2fca36057 100644
--- a/package/switch/src/switch-robo.c
+++ b/package/switch/src/switch-robo.c
@@ -21,7 +21,6 @@
  * 02110-1301, USA.
  */
 
-#include <linux/autoconf.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/if.h>
@@ -64,12 +63,7 @@
 #define SIOCGETCPHYRD           (SIOCDEVPRIVATE + 9)
 #define SIOCSETCPHYWR           (SIOCDEVPRIVATE + 10)
 
-/* linux 2.4 does not have 'bool' */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#define bool int
-#endif
-
-/* Only available on brcm-2.4/brcm47xx */
+/* Only available on brcm47xx */
 #ifdef BROADCOM
 extern char *nvram_get(const char *name);
 #define getvar(str) (nvram_get(str)?:"")
@@ -131,7 +125,7 @@ static u16 mdio_read(__u16 phy_id, __u8 reg)
 			       "[%s:%d] SIOCGETCPHYRD failed!\n", __FILE__, __LINE__);
 			return 0xffff;
 		}
-	
+
 		return args[1];
 	} else {
 		struct mii_ioctl_data *mii = (struct mii_ioctl_data *) &robo.ifr.ifr_data;
@@ -161,7 +155,7 @@ static void mdio_write(__u16 phy_id, __u8 reg, __u16 val)
 
 			return;
 		}
-		
+
 		if (do_ioctl(SIOCSETCPHYWR, args) < 0) {
 			printk(KERN_ERR PFX
 			       "[%s:%d] SIOCGETCPHYWR failed!\n", __FILE__, __LINE__);
@@ -185,13 +179,13 @@ static void mdio_write(__u16 phy_id, __u8 reg, __u16 val)
 static int robo_reg(__u8 page, __u8 reg, __u8 op)
 {
 	int i = 3;
-	
+
 	/* set page number */
-	mdio_write(robo.phy_addr, REG_MII_PAGE, 
+	mdio_write(robo.phy_addr, REG_MII_PAGE,
 		(page << 8) | REG_MII_PAGE_ENABLE);
-	
+
 	/* set register address */
-	mdio_write(robo.phy_addr, REG_MII_ADDR, 
+	mdio_write(robo.phy_addr, REG_MII_ADDR,
 		(reg << 8) | op);
 
 	/* check if operation completed */
@@ -201,7 +195,7 @@ static int robo_reg(__u8 page, __u8 reg, __u8 op)
 	}
 
 	printk(KERN_ERR PFX "[%s:%d] timeout in robo_reg!\n", __FILE__, __LINE__);
-	
+
 	return 0;
 }
 
@@ -209,9 +203,9 @@ static int robo_reg(__u8 page, __u8 reg, __u8 op)
 static void robo_read(__u8 page, __u8 reg, __u16 *val, int count)
 {
 	int i;
-	
+
 	robo_reg(page, reg, REG_MII_ADDR_READ);
-	
+
 	for (i = 0; i < count; i++)
 		val[i] = mdio_read(robo.phy_addr, REG_MII_DATA0 + i);
 }
@@ -220,14 +214,14 @@ static void robo_read(__u8 page, __u8 reg, __u16 *val, int count)
 static __u16 robo_read16(__u8 page, __u8 reg)
 {
 	robo_reg(page, reg, REG_MII_ADDR_READ);
-	
+
 	return mdio_read(robo.phy_addr, REG_MII_DATA0);
 }
 
 static __u32 robo_read32(__u8 page, __u8 reg)
 {
 	robo_reg(page, reg, REG_MII_ADDR_READ);
-	
+
 	return mdio_read(robo.phy_addr, REG_MII_DATA0) +
 		(mdio_read(robo.phy_addr, REG_MII_DATA0 + 1) << 16);
 }
@@ -245,7 +239,7 @@ static void robo_write32(__u8 page, __u8 reg, __u32 val32)
 	/* write data */
 	mdio_write(robo.phy_addr, REG_MII_DATA0, val32 & 65535);
 	mdio_write(robo.phy_addr, REG_MII_DATA0 + 1, val32 >> 16);
-	
+
 	robo_reg(page, reg, REG_MII_ADDR_WRITE);
 }
 
@@ -255,7 +249,7 @@ static int robo_vlan5350(void)
 	/* set vlan access id to 15 and read it back */
 	__u16 val16 = 15;
 	robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5350, val16);
-	
+
 	/* 5365 will refuse this as it does not have this reg */
 	return (robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5350) == val16);
 }
@@ -382,7 +376,7 @@ static int handle_vlan_port_read(void *driver, char *buf, int nr)
 	int j;
 
 	val16 = (nr) /* vlan */ | (0 << 12) /* read */ | (1 << 13) /* enable */;
-	
+
 	if (robo.is_5350) {
 		u32 val32;
 		robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS_5350, val16);
@@ -404,7 +398,7 @@ static int handle_vlan_port_read(void *driver, char *buf, int nr)
 			}
 			len += sprintf(buf + len, "\n");
 		}
-	} else { 
+	} else {
 		robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_TABLE_ACCESS, val16);
 		/* actual read */
 		val16 = robo_read16(ROBO_VLAN_PAGE, ROBO_VLAN_READ);
@@ -437,7 +431,7 @@ static int handle_vlan_port_write(void *driver, char *buf, int nr)
 	switch_vlan_config *c = switch_parse_vlan(d, buf);
 	int j;
 	__u16 val16;
-	
+
 	if (c == NULL)
 		return -EINVAL;
 
@@ -496,7 +490,7 @@ static int handle_enable_vlan_read(void *driver, char *buf, int nr)
 static int handle_enable_vlan_write(void *driver, char *buf, int nr)
 {
 	int disable = ((buf[0] != '1') ? 1 : 0);
-	
+
 	robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_CTRL0, disable ? 0 :
 		(1 << 7) /* 802.1Q VLAN */ | (3 << 5) /* mac check and hash */);
 	robo_write16(ROBO_VLAN_PAGE, ROBO_VLAN_CTRL1, disable ? 0 :
@@ -520,7 +514,7 @@ static int handle_reset(void *driver, char *buf, int nr)
 	switch_vlan_config *c = switch_parse_vlan(d, buf);
 	int j;
 	__u16 val16;
-	
+
 	if (c == NULL)
 		return -EINVAL;
 
@@ -566,7 +560,7 @@ static int __init robo_init(void)
 			notfound = robo_probe(device);
 	}
 	device[3]--;
-	
+
 	if (notfound) {
 		kfree(device);
 		return -ENODEV;