[ARM] Orion: fix various whitespace and coding style issues

[cascardo/linux.git] / arch / arm / mach-orion5x / db88f5281-setup.c

diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
index 872aed3..4ee6950 100644 (file)
--- a/arch/arm/mach-orion5x/db88f5281-setup.c
+++ b/arch/arm/mach-orion5x/db88f5281-setup.c
@@ -86,7 +86,7 @@ static struct platform_device db88f5281_boot_flash = {
        .name           = "physmap-flash",
        .id             = 0,
        .dev            = {
-               .platform_data = &db88f5281_boot_flash_data,
+               .platform_data  = &db88f5281_boot_flash_data,
        },
        .num_resources  = 1,
        .resource       = &db88f5281_boot_flash_resource,
@@ -110,7 +110,7 @@ static struct platform_device db88f5281_nor_flash = {
        .name           = "physmap-flash",
        .id             = 1,
        .dev            = {
-               .platform_data = &db88f5281_nor_flash_data,
+               .platform_data  = &db88f5281_nor_flash_data,
        },
        .num_resources  = 1,
        .resource       = &db88f5281_nor_flash_resource,
@@ -125,18 +125,15 @@ static struct mtd_partition db88f5281_nand_parts[] = {
                .name = "kernel",
                .offset = 0,
                .size = SZ_2M,
-       },
-       {
+       }, {
                .name = "root",
                .offset = SZ_2M,
                .size = (SZ_16M - SZ_2M),
-       },
-       {
+       }, {
                .name = "user",
                .offset = SZ_16M,
                .size = SZ_8M,
-       },
-       {
+       }, {
                .name = "recovery",
                .offset = (SZ_16M + SZ_8M),
                .size = SZ_8M,
@@ -241,14 +238,17 @@ void __init db88f5281_pci_preinit(void)
 
 static int __init db88f5281_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
+       int irq;
+
        /*
-        * PCIE IRQ is connected internally (not GPIO)
+        * Check for devices with hard-wired IRQs.
         */
-       if (dev->bus->number == orion5x_pcie_local_bus_nr())
-               return IRQ_ORION5X_PCIE0_INT;
+       irq = orion5x_pci_map_irq(dev, slot, pin);
+       if (irq != -1)
+               return irq;
 
        /*
-        * PCI IRQs are connected via GPIOs
+        * PCI IRQs are connected via GPIOs.
         */
        switch (slot - DB88F5281_PCI_SLOT0_OFFS) {
        case 0:
@@ -292,9 +292,7 @@ static struct mv643xx_eth_platform_data db88f5281_eth_data = {
  * RTC DS1339 on I2C bus
  ****************************************************************************/
 static struct i2c_board_info __initdata db88f5281_i2c_rtc = {
-       .driver_name    = "rtc-ds1307",
-       .type           = "ds1339",
-       .addr           = 0x68,
+       I2C_BOARD_INFO("ds1339", 0x68),
 };
 
 /*****************************************************************************