net: phy: marvell: checkpatch - Fix remaining long lines

lunn · davem330 · commit 23beb38f1911 · 2017-05-17T16:27:51.000-04:00
Fold lines longer than 80 characters

Signed-off-by: Andrew Lunn &lt;andrew@lunn.ch&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
@@ -217,9 +217,11 @@ static int marvell_config_intr(struct phy_device *phydev)
 	int err;
 
 	if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
-		err = phy_write(phydev, MII_M1011_IMASK, MII_M1011_IMASK_INIT);
+		err = phy_write(phydev, MII_M1011_IMASK,
+				MII_M1011_IMASK_INIT);
 	else
-		err = phy_write(phydev, MII_M1011_IMASK, MII_M1011_IMASK_CLEAR);
+		err = phy_write(phydev, MII_M1011_IMASK,
+				MII_M1011_IMASK_CLEAR);
 
 	return err;
 }
@@ -1394,7 +1396,8 @@ static int m88e1121_did_interrupt(struct phy_device *phydev)
 	return 0;
 }
 
-static void m88e1318_get_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol)
+static void m88e1318_get_wol(struct phy_device *phydev,
+			     struct ethtool_wolinfo *wol)
 {
 	wol->supported = WAKE_MAGIC;
 	wol->wolopts = 0;
@@ -1410,7 +1413,8 @@ static void m88e1318_get_wol(struct phy_device *phydev, struct ethtool_wolinfo *
 		return;
 }
 
-static int m88e1318_set_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol)
+static int m88e1318_set_wol(struct phy_device *phydev,
+			    struct ethtool_wolinfo *wol)
 {
 	int err, oldpage, temp;
 

Original file line number	Diff line number	Diff line change
`@@ -217,9 +217,11 @@ static int marvell_config_intr(struct phy_device *phydev)`
`217`	`217`	`int err;`
`218`	`218`
`219`	`219`	`if (phydev->interrupts == PHY_INTERRUPT_ENABLED)`
`220`		`- err = phy_write(phydev, MII_M1011_IMASK, MII_M1011_IMASK_INIT);`
	`220`	`+ err = phy_write(phydev, MII_M1011_IMASK,`
	`221`	`+ MII_M1011_IMASK_INIT);`
`221`	`222`	`else`
`222`		`- err = phy_write(phydev, MII_M1011_IMASK, MII_M1011_IMASK_CLEAR);`
	`223`	`+ err = phy_write(phydev, MII_M1011_IMASK,`
	`224`	`+ MII_M1011_IMASK_CLEAR);`
`223`	`225`
`224`	`226`	`return err;`
`225`	`227`	`}`
`@@ -1394,7 +1396,8 @@ static int m88e1121_did_interrupt(struct phy_device *phydev)`
`1394`	`1396`	`return 0;`
`1395`	`1397`	`}`
`1396`	`1398`
`1397`		`-static void m88e1318_get_wol(struct phy_device phydev, struct ethtool_wolinfo wol)`
	`1399`	`+static void m88e1318_get_wol(struct phy_device *phydev,`
	`1400`	`+ struct ethtool_wolinfo *wol)`
`1398`	`1401`	`{`
`1399`	`1402`	`wol->supported = WAKE_MAGIC;`
`1400`	`1403`	`wol->wolopts = 0;`
`@@ -1410,7 +1413,8 @@ static void m88e1318_get_wol(struct phy_device phydev, struct ethtool_wolinfo `
`1410`	`1413`	`return;`
`1411`	`1414`	`}`
`1412`	`1415`
`1413`		`-static int m88e1318_set_wol(struct phy_device phydev, struct ethtool_wolinfo wol)`
	`1416`	`+static int m88e1318_set_wol(struct phy_device *phydev,`
	`1417`	`+ struct ethtool_wolinfo *wol)`
`1414`	`1418`	`{`
`1415`	`1419`	`int err, oldpage, temp;`
`1416`	`1420`