From 2adda3cec6b01b487d89bb5a5473d4d67622c7f4 Mon Sep 17 00:00:00 2001 From: juhosg Date: Fri, 12 Nov 2010 18:51:04 +0000 Subject: ar71xx: wrap long lines (build errors has been fixed - juhosg) Signed-off-by: Arnaud Lacombe git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23977 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c | 6 ++++-- target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c | 3 ++- target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c | 3 ++- target/linux/ar71xx/files/drivers/spi/spi_vsc7385.c | 3 ++- target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c | 5 ++--- 5 files changed, 12 insertions(+), 8 deletions(-) (limited to 'target/linux/ar71xx/files/drivers') diff --git a/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c b/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c index 6cd78b628f..c8233ce59a 100644 --- a/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c +++ b/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c @@ -123,7 +123,8 @@ static int wrt160nl_parse_partitions(struct mtd_info *master, goto free_hdr; } - kernel_len = le32_to_cpu(theader->offsets[1]) + sizeof(struct cybertan_header); + kernel_len = le32_to_cpu(theader->offsets[1]) + + sizeof(struct cybertan_header); trx_parts[0].name = "u-boot"; trx_parts[0].offset = 0; @@ -137,7 +138,8 @@ static int wrt160nl_parse_partitions(struct mtd_info *master, trx_parts[2].name = "rootfs"; trx_parts[2].offset = trx_parts[1].offset + trx_parts[1].size; - trx_parts[2].size = master->size - 6 * master->erasesize - trx_parts[1].size; + trx_parts[2].size = master->size - 6 * master->erasesize - + trx_parts[1].size; trx_parts[2].mask_flags = 0; trx_parts[3].name = "nvram"; 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 a8e68404b9..c256d0584f 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c @@ -770,7 +770,8 @@ static struct ar7240sw *ar7240_probe(struct ag71xx *ag) ver = (ctrl >> AR7240_MASK_CTRL_VERSION_S) & AR7240_MASK_CTRL_VERSION_M; if (ver != 1) { - pr_err("%s: unsupported chip, ctrl=%08x\n", ag->dev->name, ctrl); + pr_err("%s: unsupported chip, ctrl=%08x\n", + ag->dev->name, ctrl); return NULL; } 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 831bba8f9b..a0af8aaa60 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c @@ -119,7 +119,8 @@ static int ag71xx_ring_alloc(struct ag71xx_ring *ring, unsigned int size) } for (i = 0; i < size; i++) { - ring->buf[i].desc = (struct ag71xx_desc *)&ring->descs_cpu[i * ring->desc_size]; + int idx = i * ring->desc_size; + ring->buf[i].desc = (struct ag71xx_desc *)&ring->descs_cpu[idx]; DBG("ag71xx: ring %p, desc %d at %p\n", ring, i, ring->buf[i].desc); } diff --git a/target/linux/ar71xx/files/drivers/spi/spi_vsc7385.c b/target/linux/ar71xx/files/drivers/spi/spi_vsc7385.c index 3935650038..9340df268b 100644 --- a/target/linux/ar71xx/files/drivers/spi/spi_vsc7385.c +++ b/target/linux/ar71xx/files/drivers/spi/spi_vsc7385.c @@ -398,7 +398,8 @@ static int vsc7385_upload_ucode(struct vsc7385 *vsc) rc = vsc7385_read(vsc, VSC73XX_BLOCK_SYSTEM, 0, VSC73XX_ICPU_SRAM, &curVal); if (rc) { - dev_err(&spi->dev, "could not read microcode %d\n",rc); + dev_err(&spi->dev, "could not read microcode %d\n", + rc); goto out; } diff --git a/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c b/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c index 6b5ff21a9b..b8b2b03c0e 100644 --- a/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c +++ b/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c @@ -215,9 +215,8 @@ static int __devinit ar71xx_wdt_probe(struct platform_device *pdev) max_timeout = (0xfffffffful / ar71xx_ahb_freq); wdt_timeout = (max_timeout < WDT_TIMEOUT) ? max_timeout : WDT_TIMEOUT; - boot_status = - (ar71xx_reset_rr(AR71XX_RESET_REG_WDOG_CTRL) & WDOG_CTRL_LAST_RESET) ? - WDIOF_CARDRESET : 0; + if (ar71xx_reset_rr(AR71XX_RESET_REG_WDOG_CTRL) & WDOG_CTRL_LAST_RESET) + boot_status = WDIOF_CARDRESET; ret = misc_register(&ar71xx_wdt_miscdev); if (ret) -- cgit v1.2.3