From ff374f247ea6d4f491d1543431e7d96bccd9645f Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sun, 15 Aug 2010 05:39:29 +0000 Subject: [PATCH] ixp4xx: fix compiler warnings in tw5334-setup.c SVN-Revision: 22654 --- .../ixp4xx/patches-2.6.32/180-tw5334_support.patch | 13 +++++++------ .../ixp4xx/patches-2.6.33/180-tw5334_support.patch | 13 +++++++------ .../ixp4xx/patches-2.6.34/180-tw5334_support.patch | 13 +++++++------ .../ixp4xx/patches-2.6.35/180-tw5334_support.patch | 13 +++++++------ 4 files changed, 28 insertions(+), 24 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 6370c998354..bed2c5dba38 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 @@ -35,7 +35,7 @@ obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o --- /dev/null +++ b/arch/arm/mach-ixp4xx/tw5334-setup.c -@@ -0,0 +1,162 @@ +@@ -0,0 +1,163 @@ +/* + * arch/arm/mach-ixp4xx/tw5334-setup.c + * @@ -169,14 +169,15 @@ + */ + f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x1000000); + if (f) { -+ for (i = 0; i < 6; i++) ++ for (i = 0; i < 6; i++) { +#ifdef __ARMEB__ -+ tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + i); -+ tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + i); ++ tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + i); ++ tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + i); +#else -+ tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + (i^3)); -+ tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + (i^3)); ++ tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + (i^3)); ++ tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + (i^3)); +#endif ++ } + iounmap(f); + } + diff --git a/target/linux/ixp4xx/patches-2.6.33/180-tw5334_support.patch b/target/linux/ixp4xx/patches-2.6.33/180-tw5334_support.patch index 6370c998354..bed2c5dba38 100644 --- a/target/linux/ixp4xx/patches-2.6.33/180-tw5334_support.patch +++ b/target/linux/ixp4xx/patches-2.6.33/180-tw5334_support.patch @@ -35,7 +35,7 @@ obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o --- /dev/null +++ b/arch/arm/mach-ixp4xx/tw5334-setup.c -@@ -0,0 +1,162 @@ +@@ -0,0 +1,163 @@ +/* + * arch/arm/mach-ixp4xx/tw5334-setup.c + * @@ -169,14 +169,15 @@ + */ + f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x1000000); + if (f) { -+ for (i = 0; i < 6; i++) ++ for (i = 0; i < 6; i++) { +#ifdef __ARMEB__ -+ tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + i); -+ tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + i); ++ tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + i); ++ tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + i); +#else -+ tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + (i^3)); -+ tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + (i^3)); ++ tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + (i^3)); ++ tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + (i^3)); +#endif ++ } + iounmap(f); + } + diff --git a/target/linux/ixp4xx/patches-2.6.34/180-tw5334_support.patch b/target/linux/ixp4xx/patches-2.6.34/180-tw5334_support.patch index 6370c998354..bed2c5dba38 100644 --- a/target/linux/ixp4xx/patches-2.6.34/180-tw5334_support.patch +++ b/target/linux/ixp4xx/patches-2.6.34/180-tw5334_support.patch @@ -35,7 +35,7 @@ obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o --- /dev/null +++ b/arch/arm/mach-ixp4xx/tw5334-setup.c -@@ -0,0 +1,162 @@ +@@ -0,0 +1,163 @@ +/* + * arch/arm/mach-ixp4xx/tw5334-setup.c + * @@ -169,14 +169,15 @@ + */ + f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x1000000); + if (f) { -+ for (i = 0; i < 6; i++) ++ for (i = 0; i < 6; i++) { +#ifdef __ARMEB__ -+ tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + i); -+ tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + i); ++ tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + i); ++ tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + i); +#else -+ tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + (i^3)); -+ tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + (i^3)); ++ tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + (i^3)); ++ tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + (i^3)); +#endif ++ } + iounmap(f); + } + diff --git a/target/linux/ixp4xx/patches-2.6.35/180-tw5334_support.patch b/target/linux/ixp4xx/patches-2.6.35/180-tw5334_support.patch index 6370c998354..bed2c5dba38 100644 --- a/target/linux/ixp4xx/patches-2.6.35/180-tw5334_support.patch +++ b/target/linux/ixp4xx/patches-2.6.35/180-tw5334_support.patch @@ -35,7 +35,7 @@ obj-$(CONFIG_IXP4XX_QMGR) += ixp4xx_qmgr.o --- /dev/null +++ b/arch/arm/mach-ixp4xx/tw5334-setup.c -@@ -0,0 +1,162 @@ +@@ -0,0 +1,163 @@ +/* + * arch/arm/mach-ixp4xx/tw5334-setup.c + * @@ -169,14 +169,15 @@ + */ + f = ioremap(IXP4XX_EXP_BUS_BASE(0), 0x1000000); + if (f) { -+ for (i = 0; i < 6; i++) ++ for (i = 0; i < 6; i++) { +#ifdef __ARMEB__ -+ tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + i); -+ tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + i); ++ tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + i); ++ tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + i); +#else -+ tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + (i^3)); -+ tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + (i^3)); ++ tw5334_plat_eth[0].hwaddr[i] = readb(f + 0xFC0422 + (i^3)); ++ tw5334_plat_eth[1].hwaddr[i] = readb(f + 0xFC043B + (i^3)); +#endif ++ } + iounmap(f); + } + -- 2.30.2