Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-11 00:08:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
More cosmetic cleanup:
- Replace 8-space indents by proper tab indents.
- In structure initialisers, use a trailing comma for every member.
- Collapse "},\n{" in structure initialiers to "}, {".

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Acked-by: Russell King <linux@arm.linux.org.uk>
This commit is contained in:
Lennert Buytenhek 2008-05-10 16:30:01 +02:00 committed by Lennert Buytenhek
parent f91a8dcc25
commit e7068ad337
8 changed files with 132 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
arch/arm/mach-orion5x/common.c
View File

@ -39,25 +39,22 @@ static struct map_desc orion5x_io_desc[] __initdata = {
.virtual = ORION5X_REGS_VIRT_BASE, .virtual = ORION5X_REGS_VIRT_BASE,
.pfn = __phys_to_pfn(ORION5X_REGS_PHYS_BASE), .pfn = __phys_to_pfn(ORION5X_REGS_PHYS_BASE),
.length = ORION5X_REGS_SIZE, .length = ORION5X_REGS_SIZE,
.type = MT_DEVICE .type = MT_DEVICE,
}, }, {
{
.virtual = ORION5X_PCIE_IO_VIRT_BASE, .virtual = ORION5X_PCIE_IO_VIRT_BASE,
.pfn = __phys_to_pfn(ORION5X_PCIE_IO_PHYS_BASE), .pfn = __phys_to_pfn(ORION5X_PCIE_IO_PHYS_BASE),
.length = ORION5X_PCIE_IO_SIZE, .length = ORION5X_PCIE_IO_SIZE,
.type = MT_DEVICE .type = MT_DEVICE,
}, }, {
{
.virtual = ORION5X_PCI_IO_VIRT_BASE, .virtual = ORION5X_PCI_IO_VIRT_BASE,
.pfn = __phys_to_pfn(ORION5X_PCI_IO_PHYS_BASE), .pfn = __phys_to_pfn(ORION5X_PCI_IO_PHYS_BASE),
.length = ORION5X_PCI_IO_SIZE, .length = ORION5X_PCI_IO_SIZE,
.type = MT_DEVICE .type = MT_DEVICE,
}, }, {
{
.virtual = ORION5X_PCIE_WA_VIRT_BASE, .virtual = ORION5X_PCIE_WA_VIRT_BASE,
.pfn = __phys_to_pfn(ORION5X_PCIE_WA_PHYS_BASE), .pfn = __phys_to_pfn(ORION5X_PCIE_WA_PHYS_BASE),
.length = ORION5X_PCIE_WA_SIZE, .length = ORION5X_PCIE_WA_SIZE,
.type = MT_DEVICE .type = MT_DEVICE,
}, },
}; };
@ -75,18 +72,15 @@ static struct resource orion5x_uart_resources[] = {
.start = UART0_PHYS_BASE, .start = UART0_PHYS_BASE,
.end = UART0_PHYS_BASE + 0xff, .end = UART0_PHYS_BASE + 0xff,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, }, {
{
.start = IRQ_ORION5X_UART0, .start = IRQ_ORION5X_UART0,
.end = IRQ_ORION5X_UART0, .end = IRQ_ORION5X_UART0,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, }, {
{
.start = UART1_PHYS_BASE, .start = UART1_PHYS_BASE,
.end = UART1_PHYS_BASE + 0xff, .end = UART1_PHYS_BASE + 0xff,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, }, {
{
.start = IRQ_ORION5X_UART1, .start = IRQ_ORION5X_UART1,
.end = IRQ_ORION5X_UART1, .end = IRQ_ORION5X_UART1,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
@ -102,8 +96,7 @@ static struct plat_serial8250_port orion5x_uart_data[] = {
.iotype = UPIO_MEM, .iotype = UPIO_MEM,
.regshift = 2, .regshift = 2,
.uartclk = ORION5X_TCLK, .uartclk = ORION5X_TCLK,
}, }, {
{
.mapbase = UART1_PHYS_BASE, .mapbase = UART1_PHYS_BASE,
.membase = (char *)UART1_VIRT_BASE, .membase = (char *)UART1_VIRT_BASE,
.irq = IRQ_ORION5X_UART1, .irq = IRQ_ORION5X_UART1,
@ -111,8 +104,8 @@ static struct plat_serial8250_port orion5x_uart_data[] = {
.iotype = UPIO_MEM, .iotype = UPIO_MEM,
.regshift = 2, .regshift = 2,
.uartclk = ORION5X_TCLK, .uartclk = ORION5X_TCLK,
}, {
}, },
{ },
}; };
static struct platform_device orion5x_uart = { static struct platform_device orion5x_uart = {
@ -134,8 +127,7 @@ static struct resource orion5x_ehci0_resources[] = {
.start = ORION5X_USB0_PHYS_BASE, .start = ORION5X_USB0_PHYS_BASE,
.end = ORION5X_USB0_PHYS_BASE + SZ_4K - 1, .end = ORION5X_USB0_PHYS_BASE + SZ_4K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, }, {
{
.start = IRQ_ORION5X_USB0_CTRL, .start = IRQ_ORION5X_USB0_CTRL,
.end = IRQ_ORION5X_USB0_CTRL, .end = IRQ_ORION5X_USB0_CTRL,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
@ -147,8 +139,7 @@ static struct resource orion5x_ehci1_resources[] = {
.start = ORION5X_USB1_PHYS_BASE, .start = ORION5X_USB1_PHYS_BASE,
.end = ORION5X_USB1_PHYS_BASE + SZ_4K - 1, .end = ORION5X_USB1_PHYS_BASE + SZ_4K - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, }, {
{
.start = IRQ_ORION5X_USB1_CTRL, .start = IRQ_ORION5X_USB1_CTRL,
.end = IRQ_ORION5X_USB1_CTRL, .end = IRQ_ORION5X_USB1_CTRL,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
@ -219,7 +210,7 @@ static struct resource orion5x_eth_resources[] = {
.start = IRQ_ORION5X_ETH_SUM, .start = IRQ_ORION5X_ETH_SUM,
.end = IRQ_ORION5X_ETH_SUM, .end = IRQ_ORION5X_ETH_SUM,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
} },
}; };
static struct platform_device orion5x_eth = { static struct platform_device orion5x_eth = {
@ -255,8 +246,7 @@ static struct resource orion5x_i2c_resources[] = {
.start = I2C_PHYS_BASE, .start = I2C_PHYS_BASE,
.end = I2C_PHYS_BASE + 0x20 -1, .end = I2C_PHYS_BASE + 0x20 -1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, }, {
{
.name = "i2c irq", .name = "i2c irq",
.start = IRQ_ORION5X_I2C, .start = IRQ_ORION5X_I2C,
.end = IRQ_ORION5X_I2C, .end = IRQ_ORION5X_I2C,
@ -283,8 +273,7 @@ static struct resource orion5x_sata_resources[] = {
.start = ORION5X_SATA_PHYS_BASE, .start = ORION5X_SATA_PHYS_BASE,
.end = ORION5X_SATA_PHYS_BASE + 0x5000 - 1, .end = ORION5X_SATA_PHYS_BASE + 0x5000 - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, }, {
{
.name = "sata irq", .name = "sata irq",
.start = IRQ_ORION5X_SATA, .start = IRQ_ORION5X_SATA,
.end = IRQ_ORION5X_SATA, .end = IRQ_ORION5X_SATA,

9
arch/arm/mach-orion5x/db88f5281-setup.c
View File

@ -125,18 +125,15 @@ static struct mtd_partition db88f5281_nand_parts[] = {
.name = "kernel", .name = "kernel",
.offset = 0, .offset = 0,
.size = SZ_2M, .size = SZ_2M,
}, }, {
{
.name = "root", .name = "root",
.offset = SZ_2M, .offset = SZ_2M,
.size = (SZ_16M - SZ_2M), .size = (SZ_16M - SZ_2M),
}, }, {
{
.name = "user", .name = "user",
.offset = SZ_16M, .offset = SZ_16M,
.size = SZ_8M, .size = SZ_8M,
}, }, {
{
.name = "recovery", .name = "recovery",
.offset = (SZ_16M + SZ_8M), .offset = (SZ_16M + SZ_8M),
.size = SZ_8M, .size = SZ_8M,

31
arch/arm/mach-orion5x/dns323-setup.c
View File

@ -119,7 +119,7 @@ static struct mtd_partition dns323_partitions[] = {
.name = "u-boot", .name = "u-boot",
.size = 0x00030000, .size = 0x00030000,
.offset = 0x007d0000, .offset = 0x007d0000,
} },
}; };
static struct physmap_flash_data dns323_nor_flash_data = { static struct physmap_flash_data dns323_nor_flash_data = {
@ -137,7 +137,9 @@ static struct resource dns323_nor_flash_resource = {
static struct platform_device dns323_nor_flash = { static struct platform_device dns323_nor_flash = {
.name = "physmap-flash", .name = "physmap-flash",
.id = 0, .id = 0,
.dev = { .platform_data = &dns323_nor_flash_data, }, .dev = {
.platform_data = &dns323_nor_flash_data,
},
.resource = &dns323_nor_flash_resource, .resource = &dns323_nor_flash_resource,
.num_resources = 1, .num_resources = 1,
}; };
@ -170,7 +172,9 @@ static struct gpio_led_platform_data dns323_led_data = {
static struct platform_device dns323_gpio_leds = { static struct platform_device dns323_gpio_leds = {
.name = "leds-gpio", .name = "leds-gpio",
.id = -1, .id = -1,
.dev = { .platform_data = &dns323_led_data, }, .dev = {
.platform_data = &dns323_led_data,
},
}; };
/**************************************************************************** /****************************************************************************
@ -183,13 +187,12 @@ static struct gpio_keys_button dns323_buttons[] = {
.gpio = DNS323_GPIO_KEY_RESET, .gpio = DNS323_GPIO_KEY_RESET,
.desc = "Reset Button", .desc = "Reset Button",
.active_low = 1, .active_low = 1,
}, }, {
{
.code = KEY_POWER, .code = KEY_POWER,
.gpio = DNS323_GPIO_KEY_POWER, .gpio = DNS323_GPIO_KEY_POWER,
.desc = "Power Button", .desc = "Power Button",
.active_low = 1, .active_low = 1,
} },
}; };
static struct gpio_keys_platform_data dns323_button_data = { static struct gpio_keys_platform_data dns323_button_data = {
@ -201,7 +204,9 @@ static struct platform_device dns323_button_device = {
.name = "gpio-keys", .name = "gpio-keys",
.id = -1, .id = -1,
.num_resources = 0, .num_resources = 0,
.dev = { .platform_data = &dns323_button_data, }, .dev = {
.platform_data = &dns323_button_data,
},
}; };
/**************************************************************************** /****************************************************************************
@ -225,17 +230,15 @@ static struct platform_device *dns323_plat_devices[] __initdata = {
static struct i2c_board_info __initdata dns323_i2c_devices[] = { static struct i2c_board_info __initdata dns323_i2c_devices[] = {
{ {
I2C_BOARD_INFO("g760a", 0x3e), I2C_BOARD_INFO("g760a", 0x3e),
},
#if 0 #if 0
/* this entry requires the new-style driver model lm75 driver, /* this entry requires the new-style driver model lm75 driver,
* for the meantime "insmod lm75.ko force_lm75=0,0x48" is needed */ * for the meantime "insmod lm75.ko force_lm75=0,0x48" is needed */
{ }, {
I2C_BOARD_INFO("g751", 0x48), I2C_BOARD_INFO("g751", 0x48),
},
#endif #endif
{ }, {
I2C_BOARD_INFO("m41t80", 0x68), I2C_BOARD_INFO("m41t80", 0x68),
} },
}; };
/* DNS-323 specific power off method */ /* DNS-323 specific power off method */
@ -292,8 +295,8 @@ static void __init dns323_init(void)
orion5x_gpio_set_valid_pins(0x07f6); orion5x_gpio_set_valid_pins(0x07f6);
/* register dns323 specific power-off method */ /* register dns323 specific power-off method */
if ((gpio_request(DNS323_GPIO_POWER_OFF, "POWEROFF") != 0) if (gpio_request(DNS323_GPIO_POWER_OFF, "POWEROFF") != 0 ||
|| (gpio_direction_output(DNS323_GPIO_POWER_OFF, 0) != 0)) gpio_direction_output(DNS323_GPIO_POWER_OFF, 0) != 0)
pr_err("DNS323: failed to setup power-off GPIO\n"); pr_err("DNS323: failed to setup power-off GPIO\n");
pm_power_off = dns323_power_off; pm_power_off = dns323_power_off;

6
arch/arm/mach-orion5x/kurobox_pro-setup.c
View File

@ -53,13 +53,11 @@ static struct mtd_partition kurobox_pro_nand_parts[] = {
.name = "uImage", .name = "uImage",
.offset = 0, .offset = 0,
.size = SZ_4M, .size = SZ_4M,
}, }, {
{
.name = "rootfs", .name = "rootfs",
.offset = SZ_4M, .offset = SZ_4M,
.size = SZ_64M, .size = SZ_64M,
}, }, {
{
.name = "extra", .name = "extra",
.offset = SZ_4M + SZ_64M, .offset = SZ_4M + SZ_64M,
.size = SZ_256M - (SZ_4M + SZ_64M), .size = SZ_256M - (SZ_4M + SZ_64M),

2
arch/arm/mach-orion5x/pci.c
View File

@ -243,7 +243,7 @@ static int __init pcie_setup(struct pci_sys_data *sys)
((n) == 1) ? ORION5X_PCI_REG(0xd08) : \ ((n) == 1) ? ORION5X_PCI_REG(0xd08) : \
((n) == 2) ? ORION5X_PCI_REG(0xc0c) : \ ((n) == 2) ? ORION5X_PCI_REG(0xc0c) : \
((n) == 3) ? ORION5X_PCI_REG(0xd0c) : 0) ((n) == 3) ? ORION5X_PCI_REG(0xd0c) : 0)
#define PCI_BAR_REMAP_DDR_CS(n) (((n) ==0) ? ORION5X_PCI_REG(0xc48) : \ #define PCI_BAR_REMAP_DDR_CS(n) (((n) == 0) ? ORION5X_PCI_REG(0xc48) : \
((n) == 1) ? ORION5X_PCI_REG(0xd48) : \ ((n) == 1) ? ORION5X_PCI_REG(0xd48) : \
((n) == 2) ? ORION5X_PCI_REG(0xc4c) : \ ((n) == 2) ? ORION5X_PCI_REG(0xc4c) : \
((n) == 3) ? ORION5X_PCI_REG(0xd4c) : 0) ((n) == 3) ? ORION5X_PCI_REG(0xd4c) : 0)

1
arch/arm/mach-orion5x/rd88f5182-setup.c
View File

@ -125,6 +125,7 @@ static int __init rd88f5182_dbgled_init(void)
leds_event = rd88f5182_dbgled_event; leds_event = rd88f5182_dbgled_event;
} }
return 0; return 0;
} }

15
arch/arm/mach-orion5x/ts209-setup.c
View File

@ -72,7 +72,7 @@ static struct mtd_partition qnap_ts209_partitions[] = {
.size = 0x00060000, .size = 0x00060000,
.offset = 0x00700000, .offset = 0x00700000,
.mask_flags = MTD_WRITEABLE, .mask_flags = MTD_WRITEABLE,
} },
}; };
static struct physmap_flash_data qnap_ts209_nor_flash_data = { static struct physmap_flash_data qnap_ts209_nor_flash_data = {
@ -90,7 +90,9 @@ static struct resource qnap_ts209_nor_flash_resource = {
static struct platform_device qnap_ts209_nor_flash = { static struct platform_device qnap_ts209_nor_flash = {
.name = "physmap-flash", .name = "physmap-flash",
.id = 0, .id = 0,
.dev = { .platform_data = &qnap_ts209_nor_flash_data, }, .dev = {
.platform_data = &qnap_ts209_nor_flash_data,
},
.resource = &qnap_ts209_nor_flash_resource, .resource = &qnap_ts209_nor_flash_resource,
.num_resources = 1, .num_resources = 1,
}; };
@ -297,13 +299,12 @@ static struct gpio_keys_button qnap_ts209_buttons[] = {
.gpio = QNAP_TS209_GPIO_KEY_MEDIA, .gpio = QNAP_TS209_GPIO_KEY_MEDIA,
.desc = "USB Copy Button", .desc = "USB Copy Button",
.active_low = 1, .active_low = 1,
}, }, {
{
.code = KEY_POWER, .code = KEY_POWER,
.gpio = QNAP_TS209_GPIO_KEY_RESET, .gpio = QNAP_TS209_GPIO_KEY_RESET,
.desc = "Reset Button", .desc = "Reset Button",
.active_low = 1, .active_low = 1,
} },
}; };
static struct gpio_keys_platform_data qnap_ts209_button_data = { static struct gpio_keys_platform_data qnap_ts209_button_data = {
@ -315,7 +316,9 @@ static struct platform_device qnap_ts209_button_device = {
.name = "gpio-keys", .name = "gpio-keys",
.id = -1, .id = -1,
.num_resources = 0, .num_resources = 0,
.dev = { .platform_data = &qnap_ts209_button_data, }, .dev = {
.platform_data = &qnap_ts209_button_data,
},
}; };
/***************************************************************************** /*****************************************************************************