ar71xx: wrap long lines

(build errors has been fixed - juhosg)

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

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-eap7660d.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-eap7660d.c
index 521156621e67d32d556cf8427fda8492e8a6f5dc..c749eec4dd03d65d3dc559643e152e6915992c85 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-eap7660d.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-eap7660d.c
@@ -87,12 +87,14 @@ void __init eap7660d_pci_init(u8 *cal_data0, u8 *mac_addr0,
        }
 
        if (mac_addr0) {
-               memcpy(eap7660d_wmac0_mac, mac_addr0, sizeof(eap7660d_wmac0_mac));
+               memcpy(eap7660d_wmac0_mac, mac_addr0,
+                       sizeof(eap7660d_wmac0_mac));
                eap7660d_wmac0_data.macaddr = eap7660d_wmac0_mac;
        }
 
        if (mac_addr1) {
-               memcpy(eap7660d_wmac1_mac, mac_addr1, sizeof(eap7660d_wmac1_mac));
+               memcpy(eap7660d_wmac1_mac, mac_addr1,
+                       sizeof(eap7660d_wmac1_mac));
                eap7660d_wmac1_data.macaddr = eap7660d_wmac1_mac;
        }
 

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-nbg460n.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-nbg460n.c
index 365b88defc1bf6b13af809dd2d3e94ae4a3aeedf..a7f5adec7cd3b2307fcafc130f5e99aa9891c337 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-nbg460n.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-nbg460n.c
@@ -219,4 +219,5 @@ static void __init nbg460n_setup(void)
                                        nbg460n_gpio_buttons);
 }
 
-MIPS_MACHINE(AR71XX_MACH_NBG460N, "NBG460N", "Zyxel NBG460N/550N/550NH", nbg460n_setup);
+MIPS_MACHINE(AR71XX_MACH_NBG460N, "NBG460N", "Zyxel NBG460N/550N/550NH",
+            nbg460n_setup);

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb4xx.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb4xx.c
index 0ec313dd05276767b312174413282aabac2a82cc..6c670fbd87e9424351730a1ea95ebc327c0868d8 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb4xx.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb4xx.c
@@ -287,11 +287,13 @@ static void __init rb450_generic_setup(int gige)
        ar71xx_add_device_mdio(~RB450_MDIO_PHYMASK);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 1);
-       ar71xx_eth0_data.phy_if_mode = (gige) ? PHY_INTERFACE_MODE_RGMII : PHY_INTERFACE_MODE_MII;
+       ar71xx_eth0_data.phy_if_mode = (gige) ?
+               PHY_INTERFACE_MODE_RGMII : PHY_INTERFACE_MODE_MII;
        ar71xx_eth0_data.phy_mask = RB450_LAN_PHYMASK;
 
        ar71xx_init_mac(ar71xx_eth1_data.mac_addr, ar71xx_mac_base, 0);
-       ar71xx_eth1_data.phy_if_mode = (gige) ? PHY_INTERFACE_MODE_RGMII : PHY_INTERFACE_MODE_RMII;
+       ar71xx_eth1_data.phy_if_mode = (gige) ?
+               PHY_INTERFACE_MODE_RGMII : PHY_INTERFACE_MODE_RMII;
        ar71xx_eth1_data.phy_mask = RB450_WAN_PHYMASK;
 
        ar71xx_add_device_eth(1);

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
index e99542f2b8a3929330ce0b307abfd79b6099e593..5b952643ab2af96a6eb7d346d09e0739c30437c7 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
@@ -170,7 +170,8 @@ static void __init ubnt_rspro_setup(void)
 {
        ubnt_generic_setup();
 
-       ar71xx_add_device_mdio(~(UBNT_RSPRO_WAN_PHYMASK | UBNT_RSPRO_LAN_PHYMASK));
+       ar71xx_add_device_mdio(~(UBNT_RSPRO_WAN_PHYMASK |
+                                UBNT_RSPRO_LAN_PHYMASK));
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;

diff --git a/target/linux/ar71xx/files/arch/mips/pci/pci-ar724x.c b/target/linux/ar71xx/files/arch/mips/pci/pci-ar724x.c
index 4ef50145e2ce02b58f25c59ff9dd3fd24fc7c1f9..bf8e369521e3066181f2623de1b33eebdfd72962 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/pci/pci-ar724x.c
+++ b/target/linux/ar71xx/files/arch/mips/pci/pci-ar724x.c
@@ -111,10 +111,9 @@ static int ar724x_pci_read_config(struct pci_bus *bus, unsigned int devfn,
         * if we set the BAR with proper base address
         */
        if ((where == 0x10) && (size == 4)) {
-               if (ar71xx_soc == AR71XX_SOC_AR7240)
-                       ar724x_pci_write(ar724x_pci_devcfg_base, where, size, 0xffff);
-               else
-                       ar724x_pci_write(ar724x_pci_devcfg_base, where, size, 0x1000ffff);
+               u32 val;
+               val = (ar71xx_soc == AR71XX_SOC_AR7240) ? 0xffff : 0x1000ffff;
+               ar724x_pci_write(ar724x_pci_devcfg_base, where, size, val);
        }
 
        return PCIBIOS_SUCCESSFUL;
@@ -256,7 +255,8 @@ static int __init ar724x_pci_setup(void)
                return -ENODEV;
        }
 
-       if (ar71xx_soc == AR71XX_SOC_AR7241 || ar71xx_soc == AR71XX_SOC_AR7242) {
+       if (ar71xx_soc == AR71XX_SOC_AR7241 ||
+           ar71xx_soc == AR71XX_SOC_AR7242) {
                t = __raw_readl(base + AR724X_PCI_REG_APP);
                t |= BIT(16);
                __raw_writel(t, base + AR724X_PCI_REG_APP);

diff --git a/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c b/target/linux/ar71xx/files/drivers/mtd/wrt160nl_part.c
index 6cd78b628f025a2228735fcf5f5ebd508891ef7d..c8233ce59a6d8f964977f469d8540987345f1768 100644 (file)
--- 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 a8e68404b93de912162b906d790670540ca05adc..c256d0584ff4da61299d8950c24d8fceb2d6a66e 100644 (file)
--- 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 831bba8f9b5f6f16d82027f24da1a93749b2836f..a0af8aaa608bf514eaf04a51142cb525b86c756d 100644 (file)
--- 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 3935650038b4b7edd4aa9dd1e8374d99bb6d44db..9340df268b4dd217d6ece3c80ec01d6e49f10dff 100644 (file)
--- 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 6b5ff21a9b068f034b6236ab99dfe758e9c6bc88..b8b2b03c0ee6b23fc3e865c67ef06cc31c85ecf1 100644 (file)
--- 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)