From f12ce1ef3e8a4191b4522d57c922326f75a91043 Mon Sep 17 00:00:00 2001
From: Imre Kaloz <kaloz@openwrt.org>
Date: Sun, 31 Jan 2010 01:29:54 +0000
Subject: [PATCH] fix some compile warnings with 2.6.32

SVN-Revision: 19435
---
 .../ixp4xx/patches-2.6.32/180-tw5334_support.patch     | 10 +++++-----
 .../ixp4xx/patches-2.6.32/190-cambria_support.patch    |  4 ++--
 .../ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch    |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/target/linux/ixp4xx/patches-2.6.32/180-tw5334_support.patch b/target/linux/ixp4xx/patches-2.6.32/180-tw5334_support.patch
index f59792a530..6370c99835 100644
--- a/target/linux/ixp4xx/patches-2.6.32/180-tw5334_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.32/180-tw5334_support.patch
@@ -149,7 +149,6 @@
 +
 +static void __init tw5334_init(void)
 +{
-+	DECLARE_MAC_BUF(mac_buf);
 +	uint8_t __iomem *f;
 +	int i;
 +
@@ -180,10 +179,11 @@
 +#endif
 +		iounmap(f);
 +	}
-+	printk(KERN_INFO "TW-533-4: Using MAC address %s for port 0\n",
-+		print_mac(mac_buf, tw5334_plat_eth[0].hwaddr));
-+	printk(KERN_INFO "TW-533-4: Using MAC address %s for port 1\n",
-+		print_mac(mac_buf, tw5334_plat_eth[1].hwaddr));
++
++	printk(KERN_INFO "TW-533-4: Using MAC address %pM for port 0\n",
++		tw5334_plat_eth[0].hwaddr);
++	printk(KERN_INFO "TW-533-4: Using MAC address %pM for port 1\n",
++		tw5334_plat_eth[1].hwaddr);
 +}
 +
 +#ifdef CONFIG_MACH_TW5334
diff --git a/target/linux/ixp4xx/patches-2.6.32/190-cambria_support.patch b/target/linux/ixp4xx/patches-2.6.32/190-cambria_support.patch
index c3791c6902..2ec8b5e444 100644
--- a/target/linux/ixp4xx/patches-2.6.32/190-cambria_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.32/190-cambria_support.patch
@@ -410,7 +410,7 @@
 +
 +static struct memory_accessor *at24_mem_acc;
 +
-+static int at24_setup(struct memory_accessor *mem_acc, void *context)
++static void at24_setup(struct memory_accessor *mem_acc, void *context)
 +{
 +	char mac_addr[ETH_ALEN];
 +	char model[6];
@@ -421,6 +421,7 @@
 +	if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x0, 6) == 6) {
 +		memcpy(&cambria_npec_data.hwaddr, mac_addr, ETH_ALEN);
 +	}
++
 +	if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x6, 6) == 6) {
 +		memcpy(&cambria_npea_data.hwaddr, mac_addr, ETH_ALEN);
 +	}
@@ -430,7 +431,6 @@
 +		cambria_info = cambria_find_board_info(model);
 +	}
 +
-+	return 0;
 +}
 +
 +static struct at24_platform_data cambria_eeprom_info = {
diff --git a/target/linux/ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch b/target/linux/ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch
index ca8cae12ca..c298834275 100644
--- a/target/linux/ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch
+++ b/target/linux/ixp4xx/patches-2.6.32/300-avila_fetch_mac.patch
@@ -159,7 +159,7 @@
 +
 +static struct memory_accessor *at24_mem_acc;
 +
-+static int at24_setup(struct memory_accessor *mem_acc, void *context)
++static void at24_setup(struct memory_accessor *mem_acc, void *context)
 +{
 +	char mac_addr[ETH_ALEN];
 +	char model[6];
@@ -170,6 +170,7 @@
 +	if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x0, 6) == 6) {
 +		memcpy(&avila_npeb_data.hwaddr, mac_addr, ETH_ALEN);
 +	}
++
 +	if (at24_mem_acc->read(at24_mem_acc, mac_addr, 0x6, 6) == 6) {
 +		memcpy(&avila_npec_data.hwaddr, mac_addr, ETH_ALEN);
 +	}
@@ -179,7 +180,6 @@
 +		avila_info = avila_find_board_info(model);
 +	}
 +
-+	return 0;
 +}
 +
 +static struct at24_platform_data avila_eeprom_info = {
-- 
2.25.1