diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-11-12 18:50:29 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-11-12 18:50:29 +0000 |
commit | b6dbd839010e50246278038736b43b54a5da95a6 (patch) | |
tree | 6636bb51d032be5cc750361b9e63af378b148a41 /target/linux/ar71xx/files/drivers/spi | |
parent | fd4246150de79f7acfc9518178b383bbb30e444e (diff) |
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
Diffstat (limited to 'target/linux/ar71xx/files/drivers/spi')
6 files changed, 31 insertions, 31 deletions
diff --git a/target/linux/ar71xx/files/drivers/spi/ap83_spi.c b/target/linux/ar71xx/files/drivers/spi/ap83_spi.c index eada5fe9cb..de8780dbbd 100644 --- a/target/linux/ar71xx/files/drivers/spi/ap83_spi.c +++ b/target/linux/ar71xx/files/drivers/spi/ap83_spi.c @@ -37,8 +37,8 @@ #define AP83_SPI_GPIO_MISO 3 struct ap83_spi { - struct spi_bitbang bitbang; - void __iomem *base; + struct spi_bitbang bitbang; + void __iomem *base; u32 addr; struct platform_device *pdev; @@ -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; } diff --git a/target/linux/ar71xx/files/drivers/spi/ar71xx_spi.c b/target/linux/ar71xx/files/drivers/spi/ar71xx_spi.c index ac60170ebf..f548cde6d4 100644 --- a/target/linux/ar71xx/files/drivers/spi/ar71xx_spi.c +++ b/target/linux/ar71xx/files/drivers/spi/ar71xx_spi.c @@ -31,11 +31,11 @@ #undef PER_BIT_READ struct ar71xx_spi { - struct spi_bitbang bitbang; + struct spi_bitbang bitbang; u32 ioc_base; u32 reg_ctrl; - void __iomem *base; + void __iomem *base; struct platform_device *pdev; u32 (*get_ioc_base)(u8 chip_select, int cs_high, @@ -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); diff --git a/target/linux/ar71xx/files/drivers/spi/pb44_spi.c b/target/linux/ar71xx/files/drivers/spi/pb44_spi.c index 32e6ea6426..ee5209905e 100644 --- a/target/linux/ar71xx/files/drivers/spi/pb44_spi.c +++ b/target/linux/ar71xx/files/drivers/spi/pb44_spi.c @@ -31,11 +31,11 @@ #undef PER_BIT_READ struct ar71xx_spi { - struct spi_bitbang bitbang; + struct spi_bitbang bitbang; u32 ioc_base; u32 reg_ctrl; - void __iomem *base; + void __iomem *base; struct platform_device *pdev; }; @@ -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); diff --git a/target/linux/ar71xx/files/drivers/spi/rb4xx_spi.c b/target/linux/ar71xx/files/drivers/spi/rb4xx_spi.c index 731f501547..2b22999915 100644 --- a/target/linux/ar71xx/files/drivers/spi/rb4xx_spi.c +++ b/target/linux/ar71xx/files/drivers/spi/rb4xx_spi.c @@ -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); @@ -338,13 +338,13 @@ static int rb4xx_spi_setup(struct spi_device *spi) if (spi->mode & ~(SPI_CS_HIGH)) { dev_err(&spi->dev, "mode %x not supported\n", - (unsigned) spi->mode); + (unsigned) spi->mode); return -EINVAL; } if (spi->bits_per_word != 8 && spi->bits_per_word != 0) { dev_err(&spi->dev, "bits_per_word %u not supported\n", - (unsigned) spi->bits_per_word); + (unsigned) spi->bits_per_word); return -EINVAL; } @@ -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; } @@ -455,10 +455,10 @@ static int rb4xx_spi_remove(struct platform_device *pdev) static struct platform_driver rb4xx_spi_drv = { .probe = rb4xx_spi_probe, .remove = rb4xx_spi_remove, - .driver = { + .driver = { .name = DRV_NAME, .owner = THIS_MODULE, - }, + }, }; static int __init rb4xx_spi_init(void) diff --git a/target/linux/ar71xx/files/drivers/spi/spi_rb4xx_cpld.c b/target/linux/ar71xx/files/drivers/spi/spi_rb4xx_cpld.c index 8b34c1b23d..c0040a3e6a 100644 --- a/target/linux/ar71xx/files/drivers/spi/spi_rb4xx_cpld.c +++ b/target/linux/ar71xx/files/drivers/spi/spi_rb4xx_cpld.c @@ -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); diff --git a/target/linux/ar71xx/files/drivers/spi/spi_vsc7385.c b/target/linux/ar71xx/files/drivers/spi/spi_vsc7385.c index c16707ed8c..3935650038 100644 --- a/target/linux/ar71xx/files/drivers/spi/spi_vsc7385.c +++ b/target/linux/ar71xx/files/drivers/spi/spi_vsc7385.c @@ -56,8 +56,8 @@ #define VSC73XX_MAC_CFG_WEXC_DIS (1 << 31) #define VSC73XX_MAC_CFG_PORT_RST (1 << 29) #define VSC73XX_MAC_CFG_TX_EN (1 << 28) -#define VSC73XX_MAC_CFG_SEED_LOAD (1 << 27) -#define VSC73XX_MAC_CFG_FDX (1 << 18) +#define VSC73XX_MAC_CFG_SEED_LOAD (1 << 27) +#define VSC73XX_MAC_CFG_FDX (1 << 18) #define VSC73XX_MAC_CFG_GIGE (1 << 17) #define VSC73XX_MAC_CFG_RX_EN (1 << 16) #define VSC73XX_MAC_CFG_VLAN_DBLAWR (1 << 15) @@ -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; |