[ARM] 3832/1: iop3xx: coding style cleanup

Since the iop32x code isn't iop321-specific, and the iop33x code isn't
iop331-specfic, do a s/iop321/iop32x/ and s/iop331/iop33x/, and tidy up
the code to conform to the coding style guidelines somewhat better.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2 files changed, 6 insertions, 6 deletions

diff --git a/arch/arm/plat-iop/i2c.c b/arch/arm/plat-iop/i2c.c
index 7ae149c2e982..e99909bdba71 100644
--- a/arch/arm/plat-iop/i2c.c
+++ b/arch/arm/plat-iop/i2c.c
@@ -31,12 +31,12 @@
 #include <asm/mach/arch.h>
 
 #ifdef CONFIG_ARCH_IOP32X
-#define IRQ_IOP3XX_I2C_0        IRQ_IOP321_I2C_0
-#define IRQ_IOP3XX_I2C_1        IRQ_IOP321_I2C_1
+#define IRQ_IOP3XX_I2C_0        IRQ_IOP32X_I2C_0
+#define IRQ_IOP3XX_I2C_1        IRQ_IOP32X_I2C_1
 #endif
 #ifdef CONFIG_ARCH_IOP33X
-#define IRQ_IOP3XX_I2C_0        IRQ_IOP331_I2C_0
-#define IRQ_IOP3XX_I2C_1        IRQ_IOP331_I2C_1
+#define IRQ_IOP3XX_I2C_0        IRQ_IOP33X_I2C_0
+#define IRQ_IOP3XX_I2C_1        IRQ_IOP33X_I2C_1
 #endif
 
 static struct resource iop3xx_i2c0_resources[] = {
diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c
index bed20f3669f4..06282dffbdc6 100644
--- a/arch/arm/plat-iop/time.c
+++ b/arch/arm/plat-iop/time.c
@@ -26,10 +26,10 @@
 #include <asm/mach/time.h>
 
 #ifdef CONFIG_ARCH_IOP32X
-#define IRQ_IOP3XX_TIMER0       IRQ_IOP321_TIMER0
+#define IRQ_IOP3XX_TIMER0       IRQ_IOP32X_TIMER0
 #else
 #ifdef CONFIG_ARCH_IOP33X
-#define IRQ_IOP3XX_TIMER0       IRQ_IOP331_TIMER0
+#define IRQ_IOP3XX_TIMER0       IRQ_IOP33X_TIMER0
 #endif
 #endif