ar71xx: fix whitespaces nits

(build error has been fixed - juhosg)

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23975 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Gabor Juhos 2010-11-12 18:50:29 +00:00
parent 7e6b8b68bb
commit 7832529d3f
58 changed files with 340 additions and 340 deletions

View File

@ -33,7 +33,7 @@ static struct ar71xx_pci_irq ap91_pci_irqs[] __initdata = {
static int ap91_pci_plat_dev_init(struct pci_dev *dev)
{
switch(PCI_SLOT(dev->devfn)) {
switch (PCI_SLOT(dev->devfn)) {
case 0:
dev->dev.platform_data = &ap91_wmac_data;
break;

View File

@ -41,7 +41,7 @@ static struct ar71xx_pci_irq ap94_pci_irqs[] __initdata = {
static int ap94_pci_plat_dev_init(struct pci_dev *dev)
{
switch(PCI_SLOT(dev->devfn)) {
switch (PCI_SLOT(dev->devfn)) {
case 17:
dev->dev.platform_data = &ap94_wmac0_data;
break;

View File

@ -271,7 +271,7 @@ asmlinkage void plat_irq_dispatch(void)
void __init arch_init_irq(void)
{
switch(ar71xx_soc) {
switch (ar71xx_soc) {
case AR71XX_SOC_AR7240:
case AR71XX_SOC_AR7241:
case AR71XX_SOC_AR7242:

View File

@ -39,19 +39,19 @@ static struct mtd_partition ap81_partitions[] = {
.offset = 0,
.size = 0x040000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "u-boot-env",
.offset = 0x040000,
.size = 0x010000,
} , {
}, {
.name = "rootfs",
.offset = 0x050000,
.size = 0x500000,
} , {
}, {
.name = "uImage",
.offset = 0x550000,
.size = 0x100000,
} , {
}, {
.name = "ART",
.offset = 0x650000,
.size = 0x1b0000,
@ -95,7 +95,7 @@ static struct gpio_button ap81_gpio_buttons[] __initdata = {
.threshold = 3,
.gpio = AP81_GPIO_BTN_SW1,
.active_low = 1,
} , {
}, {
.desc = "sw4",
.type = EV_KEY,
.code = BTN_1,

View File

@ -47,25 +47,25 @@ static struct mtd_partition ap83_flash_partitions[] = {
.offset = 0,
.size = 0x040000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "u-boot-env",
.offset = 0x040000,
.size = 0x020000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "kernel",
.offset = 0x060000,
.size = 0x140000,
} , {
}, {
.name = "rootfs",
.offset = 0x1a0000,
.size = 0x650000,
} , {
}, {
.name = "art",
.offset = 0x7f0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "firmware",
.offset = 0x060000,
.size = 0x790000,
@ -123,7 +123,7 @@ static struct gpio_button ap83_gpio_buttons[] __initdata = {
.threshold = 3,
.gpio = AP83_GPIO_BTN_RESET,
.active_low = 1,
} , {
}, {
.desc = "jumpstart",
.type = EV_KEY,
.code = KEY_WPS_BUTTON,
@ -231,7 +231,7 @@ static void __init ap83_generic_setup(void)
static void __init ap83_040_setup(void)
{
ap83_flash_data.is_shared=1;
ap83_flash_data.is_shared = 1;
ap83_generic_setup();
platform_device_register(&ap83_040_spi_device);
}

View File

@ -51,20 +51,20 @@ static struct mtd_partition ap96_partitions[] = {
.offset = 0,
.size = 0x030000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "env",
.offset = 0x030000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "rootfs",
.offset = 0x040000,
.size = 0x600000,
} , {
}, {
.name = "uImage",
.offset = 0x640000,
.size = 0x1b0000,
} , {
}, {
.name = "caldata",
.offset = 0x7f0000,
.size = 0x010000,

View File

@ -47,24 +47,24 @@ static struct mtd_partition dir_615c1_partitions[] = {
.offset = 0,
.size = 0x020000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "config",
.offset = 0x020000,
.size = 0x010000,
} , {
}, {
.name = "kernel",
.offset = 0x030000,
.size = 0x0d0000,
} , {
}, {
.name = "rootfs",
.offset = 0x100000,
.size = 0x2f0000,
} , {
}, {
.name = "art",
.offset = 0x3f0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "firmware",
.offset = 0x030000,
.size = 0x3c0000,

View File

@ -54,21 +54,21 @@ static struct mtd_partition dir825b1_partitions[] = {
.offset = 0,
.size = 0x040000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "config",
.offset = 0x040000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "firmware",
.offset = 0x050000,
.size = 0x610000,
} , {
}, {
.name = "caldata",
.offset = 0x660000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "unknown",
.offset = 0x670000,
.size = 0x190000,
@ -120,7 +120,7 @@ static struct gpio_button dir825b1_gpio_buttons[] __initdata = {
.threshold = 3,
.gpio = DIR825B1_GPIO_BTN_RESET,
.active_low = 1,
} , {
}, {
.desc = "powersave",
.type = EV_KEY,
.code = BTN_1,

View File

@ -58,7 +58,7 @@ static struct ar71xx_pci_irq eap7660d_pci_irqs[] __initdata = {
static int eap7660d_pci_plat_dev_init(struct pci_dev *dev)
{
switch(PCI_SLOT(dev->devfn)) {
switch (PCI_SLOT(dev->devfn)) {
case 17:
dev->dev.platform_data = &eap7660d_wmac0_data;
break;

View File

@ -41,24 +41,24 @@ static struct mtd_partition mzk_w04nu_partitions[] = {
.offset = 0,
.size = 0x040000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "u-boot-env",
.offset = 0x040000,
.size = 0x010000,
} , {
}, {
.name = "kernel",
.offset = 0x050000,
.size = 0x160000,
} , {
}, {
.name = "rootfs",
.offset = 0x1b0000,
.size = 0x630000,
} , {
}, {
.name = "art",
.offset = 0x7e0000,
.size = 0x020000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "firmware",
.offset = 0x050000,
.size = 0x790000,

View File

@ -40,24 +40,24 @@ static struct mtd_partition mzk_w300nh_partitions[] = {
.offset = 0,
.size = 0x040000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "u-boot-env",
.offset = 0x040000,
.size = 0x010000,
} , {
}, {
.name = "kernel",
.offset = 0x050000,
.size = 0x160000,
} , {
}, {
.name = "rootfs",
.offset = 0x1b0000,
.size = 0x630000,
} , {
}, {
.name = "art",
.offset = 0x7e0000,
.size = 0x020000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "firmware",
.offset = 0x050000,
.size = 0x790000,

View File

@ -55,28 +55,28 @@ static struct mtd_partition nbg460n_partitions[] = {
.offset = 0,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "U-Boot Config",
.offset = 0x010000,
.size = 0x030000,
} , {
}, {
.name = "U-Boot",
.offset = 0x040000,
.size = 0x030000,
} , {
}, {
.name = "linux",
.offset = 0x070000,
.size = 0x0e0000,
} , {
}, {
.name = "rootfs",
.offset = 0x150000,
.size = 0x2a0000,
} , {
}, {
.name = "CalibData",
.offset = 0x3f0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "firmware",
.offset = 0x070000,
.size = 0x380000,
@ -179,7 +179,7 @@ static struct platform_device nbg460n_rtl8366s_device = {
static void __init nbg460n_setup(void)
{
/* end of bootloader sector contains mac address*/
/* end of bootloader sector contains mac address */
u8 *mac = (u8 *) KSEG1ADDR(0x1fc0fff8);
/* last sector contains wlan calib data */
u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);

View File

@ -31,7 +31,7 @@ static struct gpio_button pb42_gpio_buttons[] __initdata = {
.threshold = 3,
.gpio = PB42_GPIO_BTN_SW4,
.active_low = 1,
} , {
}, {
.desc = "sw5",
.type = EV_KEY,
.code = BTN_1,

View File

@ -98,7 +98,7 @@ static struct gpio_button pb44_gpio_buttons[] __initdata = {
.threshold = 3,
.gpio = PB44_GPIO_SW_RESET,
.active_low = 1,
} , {
}, {
.desc = "jumpstart",
.type = EV_KEY,
.code = KEY_WPS_BUTTON,

View File

@ -28,19 +28,19 @@ static struct mtd_partition pb92_partitions[] = {
.offset = 0,
.size = 0x040000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "u-boot-env",
.offset = 0x040000,
.size = 0x010000,
} , {
}, {
.name = "rootfs",
.offset = 0x050000,
.size = 0x2b0000,
} , {
}, {
.name = "uImage",
.offset = 0x300000,
.size = 0x0e0000,
} , {
}, {
.name = "ART",
.offset = 0x3e0000,
.size = 0x020000,
@ -70,7 +70,7 @@ static struct gpio_button pb92_gpio_buttons[] __initdata = {
.threshold = 3,
.gpio = PB92_GPIO_BTN_SW4,
.active_low = 1,
} , {
}, {
.desc = "sw5",
.type = EV_KEY,
.code = BTN_1,

View File

@ -103,7 +103,7 @@ int rb750_latch_change(u32 mask_clr, u32 mask_set)
ret = 1;
unlock:
unlock:
spin_unlock_irqrestore(&lock, flags);
return ret;
}

View File

@ -40,24 +40,24 @@ static struct mtd_partition tew_632brp_partitions[] = {
.offset = 0,
.size = 0x020000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "config",
.offset = 0x020000,
.size = 0x010000,
} , {
}, {
.name = "kernel",
.offset = 0x030000,
.size = 0x0d0000,
} , {
}, {
.name = "rootfs",
.offset = 0x100000,
.size = 0x2f0000,
} , {
}, {
.name = "art",
.offset = 0x3f0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "firmware",
.offset = 0x030000,
.size = 0x3c0000,

View File

@ -40,20 +40,20 @@ static struct mtd_partition tl_mr3420_partitions[] = {
.offset = 0,
.size = 0x020000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "kernel",
.offset = 0x020000,
.size = 0x140000,
} , {
}, {
.name = "rootfs",
.offset = 0x160000,
.size = 0x290000,
} , {
}, {
.name = "art",
.offset = 0x3f0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "firmware",
.offset = 0x020000,
.size = 0x3d0000,
@ -110,7 +110,7 @@ static void __init tl_mr3420_setup(void)
u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
/* enable power for the USB port */
gpio_request(TL_MR3420_GPIO_USB_POWER,"USB power");
gpio_request(TL_MR3420_GPIO_USB_POWER, "USB power");
gpio_direction_output(TL_MR3420_GPIO_USB_POWER, 1);
ar71xx_add_device_m25p80(&tl_mr3420_flash_data);

View File

@ -36,20 +36,20 @@ static struct mtd_partition tl_wa901nd_partitions[] = {
.offset = 0,
.size = 0x020000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "kernel",
.offset = 0x020000,
.size = 0x140000,
} , {
}, {
.name = "rootfs",
.offset = 0x160000,
.size = 0x290000,
} , {
}, {
.name = "art",
.offset = 0x3f0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "firmware",
.offset = 0x020000,
.size = 0x3d0000,

View File

@ -42,20 +42,20 @@ static struct mtd_partition tl_wr1043nd_partitions[] = {
.offset = 0,
.size = 0x020000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "kernel",
.offset = 0x020000,
.size = 0x140000,
} , {
}, {
.name = "rootfs",
.offset = 0x160000,
.size = 0x690000,
} , {
}, {
.name = "art",
.offset = 0x7f0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "firmware",
.offset = 0x020000,
.size = 0x7d0000,

View File

@ -35,20 +35,20 @@ static struct mtd_partition tl_wr741nd_partitions[] = {
.offset = 0,
.size = 0x020000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "kernel",
.offset = 0x020000,
.size = 0x140000,
} , {
}, {
.name = "rootfs",
.offset = 0x160000,
.size = 0x290000,
} , {
}, {
.name = "art",
.offset = 0x3f0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "firmware",
.offset = 0x020000,
.size = 0x3d0000,

View File

@ -37,20 +37,20 @@ static struct mtd_partition tl_wr841n_v1_partitions[] = {
.offset = 0,
.size = 0x020000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "kernel",
.offset = 0x020000,
.size = 0x140000,
} , {
}, {
.name = "rootfs",
.offset = 0x160000,
.size = 0x280000,
} , {
}, {
.name = "config",
.offset = 0x3e0000,
.size = 0x020000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "firmware",
.offset = 0x020000,
.size = 0x3c0000,

View File

@ -37,20 +37,20 @@ static struct mtd_partition tl_wr941nd_partitions[] = {
.offset = 0,
.size = 0x020000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "kernel",
.offset = 0x020000,
.size = 0x140000,
} , {
}, {
.name = "rootfs",
.offset = 0x160000,
.size = 0x290000,
} , {
}, {
.name = "art",
.offset = 0x3f0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "firmware",
.offset = 0x020000,
.size = 0x3d0000,

View File

@ -55,41 +55,41 @@ static struct mtd_partition wndr3700_partitions[] = {
.offset = 0,
.size = 0x050000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "env",
.offset = 0x050000,
.size = 0x020000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "rootfs",
.offset = 0x070000,
.size = 0x720000,
} , {
}, {
.name = "config",
.offset = 0x790000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "config_bak",
.offset = 0x7a0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "pot",
.offset = 0x7b0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "traffic_meter",
.offset = 0x7c0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "language",
.offset = 0x7d0000,
.size = 0x020000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "caldata",
.offset = 0x7f0000,
.size = 0x010000,
@ -144,7 +144,7 @@ static struct gpio_button wndr3700_gpio_buttons[] __initdata = {
.threshold = 3,
.gpio = WNDR3700_GPIO_BTN_WPS,
.active_low = 1,
} , {
}, {
.desc = "wifi",
.type = EV_KEY,
.code = BTN_2,

View File

@ -38,31 +38,31 @@ static struct mtd_partition wnr2000_partitions[] = {
.offset = 0,
.size = 0x040000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "u-boot-env",
.offset = 0x040000,
.size = 0x010000,
} , {
}, {
.name = "rootfs",
.offset = 0x050000,
.size = 0x240000,
} , {
}, {
.name = "user-config",
.offset = 0x290000,
.size = 0x010000,
} , {
}, {
.name = "uImage",
.offset = 0x2a0000,
.size = 0x120000,
} , {
}, {
.name = "language_table",
.offset = 0x3c0000,
.size = 0x020000,
} , {
}, {
.name = "rootfs_checksum",
.offset = 0x3e0000,
.size = 0x010000,
} , {
}, {
.name = "art",
.offset = 0x3f0000,
.size = 0x010000,

View File

@ -42,25 +42,25 @@ static struct mtd_partition wrt160nl_partitions[] = {
.offset = 0,
.size = 0x040000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "kernel",
.offset = 0x040000,
.size = 0x0e0000,
} , {
}, {
.name = "filesytem",
.offset = 0x120000,
.size = 0x6c0000,
} , {
}, {
.name = "nvram",
.offset = 0x7e0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "ART",
.offset = 0x7f0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "firmware",
.offset = 0x040000,
.size = 0x7a0000,

View File

@ -42,40 +42,40 @@ static struct mtd_partition wrt400n_partitions[] = {
.offset = 0,
.size = 0x030000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "env",
.offset = 0x030000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "linux",
.offset = 0x040000,
.size = 0x140000,
} , {
}, {
.name = "rootfs",
.offset = 0x180000,
.size = 0x630000,
} , {
}, {
.name = "nvram",
.offset = 0x7b0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "factory",
.offset = 0x7c0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "language",
.offset = 0x7d0000,
.size = 0x020000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "caldata",
.offset = 0x7f0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "firmware",
.offset = 0x040000,
.size = 0x770000,
@ -118,7 +118,7 @@ static struct gpio_button wrt400n_gpio_buttons[] __initdata = {
.threshold = 3,
.gpio = WRT400N_GPIO_BTN_RESET,
.active_low = 1,
} , {
}, {
.desc = "wlsec",
.type = EV_KEY,
.code = KEY_WPS_BUTTON,

View File

@ -43,35 +43,35 @@ static struct mtd_partition zcn_1523h_partitions[] = {
.offset = 0,
.size = 0x040000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "u-boot-env",
.offset = 0x040000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "rootfs",
.offset = 0x050000,
.size = 0x610000,
} , {
}, {
.name = "kernel",
.offset = 0x660000,
.size = 0x170000,
} , {
}, {
.name = "configure",
.offset = 0x7d0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "mfg",
.offset = 0x7e0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "eeprom",
.offset = 0x7f0000,
.size = 0x010000,
.mask_flags = MTD_WRITEABLE,
} , {
}, {
.name = "firmware",
.offset = 0x050000,
.size = 0x780000,

View File

@ -69,7 +69,7 @@ int nvram_parse_mac_addr(const char *nvram, unsigned nvram_len,
ret = 0;
free:
free:
vfree(buf);
return ret;
}

View File

@ -63,7 +63,7 @@ static void __init ar71xx_detect_mem_size(void)
unsigned long size;
for (size = AR71XX_MEM_SIZE_MIN; size < AR71XX_MEM_SIZE_MAX;
size <<= 1 ) {
size <<= 1) {
if (!memcmp(ar71xx_detect_mem_size,
ar71xx_detect_mem_size + size, 1024))
break;

View File

@ -33,8 +33,8 @@ struct ag71xx_platform_data {
u8 has_ar8216:1;
u8 has_ar7240_switch:1;
void (* ddr_flush)(void);
void (* set_pll)(int speed);
void (*ddr_flush)(void);
void (*set_pll)(int speed);
u32 fifo_cfg1;
u32 fifo_cfg2;

View File

@ -384,12 +384,12 @@ int __init ar724x_pcibios_init(void)
return 0;
err_unmap_ctrl:
err_unmap_ctrl:
iounmap(ar724x_pci_ctrl_base);
err_unmap_devcfg:
err_unmap_devcfg:
iounmap(ar724x_pci_devcfg_base);
err_unmap_localcfg:
err_unmap_localcfg:
iounmap(ar724x_pci_localcfg_base);
err:
err:
return ret;
}

View File

@ -179,15 +179,15 @@ static int __devinit nxp_74hc153_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, nxp);
return 0;
err_free_2y:
err_free_2y:
gpio_free(pdata->gpio_pin_2y);
err_free_1y:
err_free_1y:
gpio_free(pdata->gpio_pin_1y);
err_free_s1:
err_free_s1:
gpio_free(pdata->gpio_pin_s1);
err_free_s0:
err_free_s0:
gpio_free(pdata->gpio_pin_s0);
err_free_nxp:
err_free_nxp:
kfree(nxp);
return err;
}

View File

@ -90,7 +90,7 @@ static int __devinit rb750_led_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, drvdata);
return 0;
err:
err:
for (i = i - 1; i >= 0; i--)
led_classdev_unregister(&drvdata->led_devs[i].cdev);

View File

@ -227,7 +227,7 @@ static int ar91xx_flash_probe(struct platform_device *pdev)
add_mtd_device(info->mtd);
return 0;
err_out:
err_out:
ar91xx_flash_remove(pdev);
return err;
}
@ -246,7 +246,7 @@ static int ar91xx_flash_suspend(struct platform_device *dev, pm_message_t state)
return 0;
fail:
fail:
if (info->mtd->suspend) {
BUG_ON(!info->mtd->resume);
info->mtd->resume(info->mtd);

View File

@ -244,21 +244,21 @@ static int __init rb4xx_nand_probe(struct platform_device *pdev)
return 0;
err_release_nand:
err_release_nand:
nand_release(&info->mtd);
err_set_drvdata:
err_set_drvdata:
platform_set_drvdata(pdev, NULL);
err_free_info:
err_free_info:
kfree(info);
err_free_gpio_nce:
err_free_gpio_nce:
gpio_free(RB4XX_NAND_GPIO_NCE);
err_free_gpio_cle:
err_free_gpio_cle:
gpio_free(RB4XX_NAND_GPIO_CLE);
err_free_gpio_ale:
err_free_gpio_ale:
gpio_free(RB4XX_NAND_GPIO_ALE);
err_free_gpio_ready:
err_free_gpio_ready:
gpio_free(RB4XX_NAND_GPIO_READY);
err:
err:
return ret;
}

View File

@ -313,11 +313,11 @@ static int __init rb750_nand_probe(struct platform_device *pdev)
return 0;
err_release_nand:
err_release_nand:
nand_release(&info->mtd);
err_set_drvdata:
err_set_drvdata:
platform_set_drvdata(pdev, NULL);
err_free_info:
err_free_info:
kfree(info);
return ret;
}

View File

@ -158,9 +158,9 @@ static int wrt160nl_parse_partitions(struct mtd_info *master,
*pparts = trx_parts;
ret = TRX_PARTS;
free_hdr:
free_hdr:
vfree(header);
out:
out:
return ret;
}

View File

@ -173,7 +173,7 @@ int ag71xx_debugfs_init(struct ag71xx *ag)
return 0;
err:
err:
ag71xx_debugfs_exit(ag);
return -ENOMEM;
}

View File

@ -14,14 +14,14 @@
#include "ag71xx.h"
#define AG71XX_DEFAULT_MSG_ENABLE \
( NETIF_MSG_DRV \
(NETIF_MSG_DRV \
| NETIF_MSG_PROBE \
| NETIF_MSG_LINK \
| NETIF_MSG_TIMER \
| NETIF_MSG_IFDOWN \
| NETIF_MSG_IFUP \
| NETIF_MSG_RX_ERR \
| NETIF_MSG_TX_ERR )
| NETIF_MSG_TX_ERR)
static int ag71xx_msg_level = -1;
@ -126,7 +126,7 @@ static int ag71xx_ring_alloc(struct ag71xx_ring *ring, unsigned int size)
return 0;
err:
err:
return err;
}
@ -599,7 +599,7 @@ static int ag71xx_open(struct net_device *dev)
return 0;
err:
err:
ag71xx_rings_cleanup(ag);
return ret;
}
@ -676,7 +676,7 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
return NETDEV_TX_OK;
err_drop:
err_drop:
dev->stats.tx_dropped++;
dev_kfree_skb(skb);
@ -908,12 +908,12 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
return rx_done;
}
more:
more:
DBG("%s: stay in polling mode, rx=%d, tx=%d, limit=%d\n",
dev->name, rx_done, tx_done, limit);
return rx_done;
oom:
oom:
if (netif_msg_rx_err(ag))
printk(KERN_DEBUG "%s: out of memory\n", dev->name);
@ -1105,19 +1105,19 @@ static int __devinit ag71xx_probe(struct platform_device *pdev)
return 0;
err_phy_disconnect:
err_phy_disconnect:
ag71xx_phy_disconnect(ag);
err_unregister_netdev:
err_unregister_netdev:
unregister_netdev(dev);
err_free_irq:
err_free_irq:
free_irq(dev->irq, dev);
err_unmap_mii_ctrl:
err_unmap_mii_ctrl:
iounmap(ag->mii_ctrl);
err_unmap_base:
err_unmap_base:
iounmap(ag->mac_base);
err_free_dev:
err_free_dev:
kfree(dev);
err_out:
err_out:
platform_set_drvdata(pdev, NULL);
return err;
}
@ -1168,11 +1168,11 @@ static int __init ag71xx_module_init(void)
return 0;
err_mdio_exit:
err_mdio_exit:
ag71xx_mdio_driver_exit();
err_debugfs_exit:
err_debugfs_exit:
ag71xx_debugfs_root_exit();
err_out:
err_out:
return ret;
}

View File

@ -73,7 +73,7 @@ static int ag71xx_mdio_mii_read(struct ag71xx_mdio *am, int addr, int reg)
DBG("mii_read: addr=%04x, reg=%04x, value=%04x\n", addr, reg, ret);
out:
out:
return ret;
}
@ -199,13 +199,13 @@ static int __devinit ag71xx_mdio_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, am);
return 0;
err_free_bus:
err_free_bus:
mdiobus_free(am->mii_bus);
err_iounmap:
err_iounmap:
iounmap(am->mdio_base);
err_free_mdio:
err_free_mdio:
kfree(am);
err_out:
err_out:
return err;
}

View File

@ -230,15 +230,15 @@ static int ap83_spi_probe(struct platform_device *pdev)
return 0;
err_unmap:
err_unmap:
iounmap(sp->base);
err_spi_put:
err_spi_put:
platform_set_drvdata(pdev, NULL);
spi_master_put(sp->bitbang.master);
err_free_cs:
err_free_cs:
gpio_free(AP83_SPI_GPIO_CS);
err_free_miso:
err_free_miso:
gpio_free(AP83_SPI_GPIO_MISO);
return ret;
}

View File

@ -234,7 +234,7 @@ static int ar71xx_spi_probe(struct platform_device *pdev)
return 0;
iounmap(sp->base);
err1:
err1:
platform_set_drvdata(pdev, NULL);
spi_master_put(sp->bitbang.master);

View File

@ -252,7 +252,7 @@ static int pb44_spi_probe(struct platform_device *pdev)
return 0;
iounmap(sp->base);
err1:
err1:
platform_set_drvdata(pdev, NULL);
spi_master_put(sp->bitbang.master);

View File

@ -247,7 +247,7 @@ static int rb4xx_spi_msg(struct rb4xx_spi *rbspi, struct spi_message *m)
__raw_writel(SPI_CTRL_FASTEST, base + SPI_REG_CTRL);
do_spi_init(m->spi);
list_for_each_entry (t, &m->transfers, transfer_list) {
list_for_each_entry(t, &m->transfers, transfer_list) {
int len;
len = rb4xx_spi_txrx(base, t);
@ -432,12 +432,12 @@ static int rb4xx_spi_probe(struct platform_device *pdev)
return 0;
err_iounmap:
err_iounmap:
iounmap(rbspi->base);
err_put_master:
err_put_master:
platform_set_drvdata(pdev, NULL);
spi_master_put(master);
err_out:
err_out:
return err;
}

View File

@ -393,7 +393,7 @@ static int __devinit rb4xx_cpld_probe(struct spi_device *spi)
return 0;
err_drvdata:
err_drvdata:
dev_set_drvdata(&spi->dev, NULL);
kfree(cpld);

View File

@ -430,7 +430,7 @@ static int vsc7385_upload_ucode(struct vsc7385 *vsc)
rc = vsc7385_icpu_start(vsc);
out:
out:
release_firmware(firmware);
return rc;
}
@ -475,7 +475,7 @@ static int vsc7385_setup(struct vsc7385 *vsc)
return 0;
err:
err:
return err;
}
@ -520,7 +520,7 @@ static int vsc7385_detect(struct vsc7385 *vsc)
rev = (t >> VSC73XX_ICPU_CHIPID_REV_SHIFT) &
VSC73XX_ICPU_CHIPID_REV_MASK;
dev_info(&spi->dev, "VSC%04X (rev. %d) switch found \n", id, rev);
dev_info(&spi->dev, "VSC%04X (rev. %d) switch found\n", id, rev);
return 0;
}
@ -536,13 +536,13 @@ static int __devinit vsc7385_probe(struct spi_device *spi)
pdata = spi->dev.platform_data;
if (!pdata) {
dev_err(&spi->dev, "no platform data specified\n");
return-ENODEV;
return -ENODEV;
}
vsc = kzalloc(sizeof(*vsc), GFP_KERNEL);
if (!vsc) {
dev_err(&spi->dev, "no memory for private data\n");
return-ENOMEM;
return -ENOMEM;
}
mutex_init(&vsc->lock);
@ -554,13 +554,13 @@ static int __devinit vsc7385_probe(struct spi_device *spi)
spi->bits_per_word = 8;
err = spi_setup(spi);
if (err) {
dev_err(&spi->dev, "spi_setup failed, err=%d \n", err);
dev_err(&spi->dev, "spi_setup failed, err=%d\n", err);
goto err_drvdata;
}
err = vsc7385_detect(vsc);
if (err) {
dev_err(&spi->dev, "no chip found, err=%d \n", err);
dev_err(&spi->dev, "no chip found, err=%d\n", err);
goto err_drvdata;
}
@ -574,7 +574,7 @@ static int __devinit vsc7385_probe(struct spi_device *spi)
return 0;
err_drvdata:
err_drvdata:
dev_set_drvdata(&spi->dev, NULL);
kfree(vsc);
return err;

View File

@ -117,12 +117,12 @@ static int ehci_ar71xx_probe(const struct hc_driver *driver,
return 0;
err_iounmap:
err_iounmap:
iounmap(hcd->regs);
err_release_region:
err_release_region:
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
err_put_hcd:
err_put_hcd:
usb_put_hcd(hcd);
return ret;
}

View File

@ -70,11 +70,11 @@ static int usb_hcd_ar71xx_probe(const struct hc_driver *driver,
return 0;
err_stop_hcd:
err_stop_hcd:
iounmap(hcd->regs);
err_release_region:
err_release_region:
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
err_put_hcd:
err_put_hcd:
usb_put_hcd(hcd);
return ret;
}
@ -102,7 +102,7 @@ static int __devinit ohci_ar71xx_start(struct usb_hcd *hcd)
return 0;
err:
err:
ohci_stop(hcd);
return ret;
}

View File

@ -9,7 +9,7 @@
*/
struct vsc7385_platform_data {
void (* reset)(void);
void (*reset)(void);
char *ucode_name;
struct {
u32 tx_ipg:5;