summaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/files/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/ar71xx/files/drivers')
-rw-r--r--target/linux/ar71xx/files/drivers/gpio/nxp_74hc153.c10
-rw-r--r--target/linux/ar71xx/files/drivers/leds/leds-rb750.c2
-rw-r--r--target/linux/ar71xx/files/drivers/mtd/maps/ar91xx_flash.c4
-rw-r--r--target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c16
-rw-r--r--target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c6
-rw-r--r--target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c4
-rw-r--r--target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h4
-rw-r--r--target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c14
-rw-r--r--target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_debugfs.c6
-rw-r--r--target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c34
-rw-r--r--target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c10
-rw-r--r--target/linux/ar71xx/files/drivers/spi/ap83_spi.c12
-rw-r--r--target/linux/ar71xx/files/drivers/spi/ar71xx_spi.c6
-rw-r--r--target/linux/ar71xx/files/drivers/spi/pb44_spi.c6
-rw-r--r--target/linux/ar71xx/files/drivers/spi/rb4xx_spi.c16
-rw-r--r--target/linux/ar71xx/files/drivers/spi/spi_rb4xx_cpld.c2
-rw-r--r--target/linux/ar71xx/files/drivers/spi/spi_vsc7385.c20
-rw-r--r--target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c6
-rw-r--r--target/linux/ar71xx/files/drivers/usb/host/ohci-ar71xx.c8
-rw-r--r--target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c6
20 files changed, 96 insertions, 96 deletions
diff --git a/target/linux/ar71xx/files/drivers/gpio/nxp_74hc153.c b/target/linux/ar71xx/files/drivers/gpio/nxp_74hc153.c
index 0c2d30ef7..a5fec5ca7 100644
--- a/target/linux/ar71xx/files/drivers/gpio/nxp_74hc153.c
+++ b/target/linux/ar71xx/files/drivers/gpio/nxp_74hc153.c
@@ -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;
}
diff --git a/target/linux/ar71xx/files/drivers/leds/leds-rb750.c b/target/linux/ar71xx/files/drivers/leds/leds-rb750.c
index 6d9920129..531ac6b51 100644
--- a/target/linux/ar71xx/files/drivers/leds/leds-rb750.c
+++ b/target/linux/ar71xx/files/drivers/leds/leds-rb750.c
@@ -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);
diff --git a/target/linux/ar71xx/files/drivers/mtd/maps/ar91xx_flash.c b/target/linux/ar71xx/files/drivers/mtd/maps/ar91xx_flash.c
index 1a55f4a54..51ba7f578 100644
--- a/target/linux/ar71xx/files/drivers/mtd/maps/ar91xx_flash.c
+++ b/target/linux/ar71xx/files/drivers/mtd/maps/ar91xx_flash.c
@@ -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);
diff --git a/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c b/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
index ca9d8adb5..17920e9f4 100644
--- a/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
+++ b/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
@@ -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;
}
diff --git a/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c b/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c
index badc7819b..07bf8e129 100644
--- a/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c
+++ b/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c
@@ -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;
}
diff --git a/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c b/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c
index e42b3d401..6cd78b628 100644
--- a/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c
+++ b/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c
@@ -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;
}
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
index be14e7e08..b370cf6bc 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
@@ -89,7 +89,7 @@ struct ag71xx_desc {
struct ag71xx_buf {
struct sk_buff *skb;
- struct ag71xx_desc *desc;
+ struct ag71xx_desc *desc;
dma_addr_t dma_addr;
u32 pad;
};
@@ -162,7 +162,7 @@ struct ag71xx {
unsigned int link;
unsigned int speed;
- int duplex;
+ int duplex;
struct work_struct restart_work;
struct timer_list oom_timer;
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c
index fec9a87ba..a8e68404b 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c
@@ -414,7 +414,7 @@ static int ar7240sw_reset(struct ar7240sw *as)
AR7240_MASK_CTRL_SOFT_RESET);
ret = ar7240sw_reg_wait(as, AR7240_REG_MASK_CTRL,
- AR7240_MASK_CTRL_SOFT_RESET, 0, 1000);
+ AR7240_MASK_CTRL_SOFT_RESET, 0, 1000);
return ret;
}
@@ -518,7 +518,7 @@ static int ar7240_set_addr(struct ar7240sw *as, u8 *addr)
static int
ar7240_set_vid(struct switch_dev *dev, const struct switch_attr *attr,
- struct switch_val *val)
+ struct switch_val *val)
{
struct ar7240sw *as = sw_to_ar7240(dev);
as->vlan_id[val->port_vlan] = val->value.i;
@@ -527,7 +527,7 @@ ar7240_set_vid(struct switch_dev *dev, const struct switch_attr *attr,
static int
ar7240_get_vid(struct switch_dev *dev, const struct switch_attr *attr,
- struct switch_val *val)
+ struct switch_val *val)
{
struct ar7240sw *as = sw_to_ar7240(dev);
val->value.i = as->vlan_id[val->port_vlan];
@@ -613,7 +613,7 @@ ar7240_set_ports(struct switch_dev *dev, struct switch_val *val)
static int
ar7240_set_vlan(struct switch_dev *dev, const struct switch_attr *attr,
- struct switch_val *val)
+ struct switch_val *val)
{
struct ar7240sw *as = sw_to_ar7240(dev);
as->vlan = !!val->value.i;
@@ -622,7 +622,7 @@ ar7240_set_vlan(struct switch_dev *dev, const struct switch_attr *attr,
static int
ar7240_get_vlan(struct switch_dev *dev, const struct switch_attr *attr,
- struct switch_val *val)
+ struct switch_val *val)
{
struct ar7240sw *as = sw_to_ar7240(dev);
val->value.i = as->vlan;
@@ -790,8 +790,8 @@ static struct ar7240sw *ar7240_probe(struct ag71xx *ag)
swdev->ops = &ar7240_ops;
if (register_switch(&as->swdev, ag->dev) < 0) {
- kfree(as);
- return NULL;
+ kfree(as);
+ return NULL;
}
printk("%s: Found an AR7240 built-in switch\n", ag->dev->name);
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_debugfs.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_debugfs.c
index c37265e7b..8111cad35 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_debugfs.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_debugfs.c
@@ -44,8 +44,8 @@ void ag71xx_debugfs_update_int_stats(struct ag71xx *ag, u32 status)
static ssize_t read_file_int_stats(struct file *file, char __user *user_buf,
size_t count, loff_t *ppos)
{
-#define PR_INT_STAT(_label, _field) \
- len += snprintf(buf + len, sizeof(buf) - len, \
+#define PR_INT_STAT(_label, _field) \
+ len += snprintf(buf + len, sizeof(buf) - len, \
"%20s: %10lu\n", _label, ag->debug.int_stats._field);
struct ag71xx *ag = file->private_data;
@@ -173,7 +173,7 @@ int ag71xx_debugfs_init(struct ag71xx *ag)
return 0;
- err:
+err:
ag71xx_debugfs_exit(ag);
return -ENOMEM;
}
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
index 31c8ee489..831bba8f9 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -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;
}
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c
index eda0b5ee5..2664429e7 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_mdio.c
@@ -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;
}
diff --git a/target/linux/ar71xx/files/drivers/spi/ap83_spi.c b/target/linux/ar71xx/files/drivers/spi/ap83_spi.c
index eada5fe9c..de8780dbb 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 ac60170eb..f548cde6d 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 32e6ea642..ee5209905 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 731f50154..2b2299991 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 8b34c1b23..c0040a3e6 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 c16707ed8..393565003 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;
diff --git a/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c b/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c
index 01433c2fb..b08db5baf 100644
--- a/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c
+++ b/target/linux/ar71xx/files/drivers/usb/host/ehci-ar71xx.c
@@ -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;
}
diff --git a/target/linux/ar71xx/files/drivers/usb/host/ohci-ar71xx.c b/target/linux/ar71xx/files/drivers/usb/host/ohci-ar71xx.c
index 48457e013..1ab33f3bf 100644
--- a/target/linux/ar71xx/files/drivers/usb/host/ohci-ar71xx.c
+++ b/target/linux/ar71xx/files/drivers/usb/host/ohci-ar71xx.c
@@ -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;
}
diff --git a/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c b/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c
index 5f8104bcd..6b5ff21a9 100644
--- a/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c
+++ b/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c
@@ -115,7 +115,7 @@ static int ar71xx_wdt_release(struct inode *inode, struct file *file)
static ssize_t ar71xx_wdt_write(struct file *file, const char *data,
size_t len, loff_t *ppos)
{
- if (len) {
+ if (len) {
if (!nowayout) {
size_t i;
@@ -142,7 +142,7 @@ static ssize_t ar71xx_wdt_write(struct file *file, const char *data,
static struct watchdog_info ar71xx_wdt_info = {
.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |
WDIOF_MAGICCLOSE | WDIOF_CARDRESET,
- .firmware_version = 0,
+ .firmware_version = 0,
.identity = "AR71XX watchdog",
};
@@ -226,7 +226,7 @@ static int __devinit ar71xx_wdt_probe(struct platform_device *pdev)
printk(KERN_INFO DRV_DESC " version " DRV_VERSION "\n");
printk(KERN_DEBUG DRV_NAME ": timeout=%d secs (max=%d)\n",
- wdt_timeout, max_timeout);
+ wdt_timeout, max_timeout);
return 0;