Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4aae620 authored by Mark Einon's avatar Mark Einon Committed by Greg Kroah-Hartman
Browse files

staging: et131x: Cat some lines less than 80 columns 



Some split lines are less than 80 chars if rejoined, so rejoin them.

Reported-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarMark Einon <mark.einon@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 37dcca43

drivers/staging/et131x/et131x.c

+6 −6
Original line number Diff line number Diff line
@@ -3393,7 +3393,8 @@ static void et131x_adjust_link(struct net_device *netdev) 
			et131x_mii_read(adapter, PHY_MPHY_CONTROL_REG,

					&register18);

			et131x_mii_write(adapter, phydev->addr,

					 PHY_MPHY_CONTROL_REG, register18 | 0x4);

					 PHY_MPHY_CONTROL_REG,

					 register18 | 0x4);

			et131x_mii_write(adapter, phydev->addr, PHY_INDEX_REG,

					 register18 | 0x8402);

			et131x_mii_write(adapter, phydev->addr, PHY_DATA_REG,
@@ -3426,7 +3427,8 @@ static void et131x_adjust_link(struct net_device *netdev) 
			et131x_mii_read(adapter, PHY_MPHY_CONTROL_REG,

					&register18);

			et131x_mii_write(adapter, phydev->addr,

					 PHY_MPHY_CONTROL_REG, register18 | 0x4);

					 PHY_MPHY_CONTROL_REG,

					 register18 | 0x4);

			et131x_mii_write(adapter, phydev->addr,

					 PHY_INDEX_REG, register18 | 0x8402);

			et131x_mii_write(adapter, phydev->addr,
@@ -3750,8 +3752,7 @@ static irqreturn_t et131x_isr(int irq, void *dev_id) 
		 */

		/* TRAP();*/



		dev_warn(&adapter->pdev->dev,

			 "RxDMA_ERR interrupt, error %x\n",

		dev_warn(&adapter->pdev->dev, "RxDMA_ERR interrupt, error %x\n",

			 readl(&iomem->txmac.tx_test));

	}
@@ -3777,8 +3778,7 @@ static irqreturn_t et131x_isr(int irq, void *dev_id) 
		 * occur. In a nutshell, the whole Tx path will have to be reset

		 * and re-configured afterwards.

		 */

		dev_warn(&adapter->pdev->dev,

			 "TXMAC interrupt, error 0x%08x\n",

		dev_warn(&adapter->pdev->dev, "TXMAC interrupt, error 0x%08x\n",

			 err);



		/* If we are debugging, we want to see this error, otherwise we