[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>

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/arm/mach-iop33x/iq80331.c b/arch/arm/mach-iop33x/iq80331.c
index 6b8475da3df6..97a7b7488264 100644
--- a/arch/arm/mach-iop33x/iq80331.c
+++ b/arch/arm/mach-iop33x/iq80331.c
@@ -61,19 +61,19 @@ iq80331_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 
         if (slot == 1 && pin == 1) {
                 /* PCI-X Slot INTA */
-                irq = IRQ_IOP331_XINT1;
+                irq = IRQ_IOP33X_XINT1;
         } else if (slot == 1 && pin == 2) {
                 /* PCI-X Slot INTB */
-                irq = IRQ_IOP331_XINT2;
+                irq = IRQ_IOP33X_XINT2;
         } else if (slot == 1 && pin == 3) {
                 /* PCI-X Slot INTC */
-                irq = IRQ_IOP331_XINT3;
+                irq = IRQ_IOP33X_XINT3;
         } else if (slot == 1 && pin == 4) {
                 /* PCI-X Slot INTD */
-                irq = IRQ_IOP331_XINT0;
+                irq = IRQ_IOP33X_XINT0;
         } else if (slot == 2) {
                 /* GigE */
-                irq = IRQ_IOP331_XINT2;
+                irq = IRQ_IOP33X_XINT2;
         } else {
                 printk(KERN_ERR "iq80331_pci_map_irq() called for unknown "
                         "device PCI:%d:%d:%d\n", dev->bus->number,
@@ -142,7 +142,7 @@ MACHINE_START(IQ80331, "Intel IQ80331")
         .io_pg_offst    = ((0xfffff000) >> 18) & 0xfffc,
         .boot_params    = 0x00000100,
         .map_io         = iop3xx_map_io,
-        .init_irq       = iop331_init_irq,
+        .init_irq       = iop33x_init_irq,
         .timer          = &iq80331_timer,
         .init_machine   = iq80331_init_machine,
 MACHINE_END