Merge branch 'phy_checkpatch'

davem330 · davem330 · commit cea883bb6851 · 2013-12-18T00:49:35.000-05:00
Florian Fainelli says:

====================
net: phy: fix checkpatch errors

This patchset fixes trivial checkpatch errors, no functional change
introduced.
====================

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/phy/cicada.c b/drivers/net/phy/cicada.c
@@ -92,8 +92,8 @@ static int cis820x_config_intr(struct phy_device *phydev)
 {
 	int err;
 
-	if(phydev->interrupts == PHY_INTERRUPT_ENABLED)
-		err = phy_write(phydev, MII_CIS8201_IMASK, 
+	if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
+		err = phy_write(phydev, MII_CIS8201_IMASK,
 				MII_CIS8201_IMASK_MASK);
 	else
 		err = phy_write(phydev, MII_CIS8201_IMASK, 0);
diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c
@@ -72,7 +72,7 @@ static int dm9161_config_intr(struct phy_device *phydev)
 	if (temp < 0)
 		return temp;
 
-	if(PHY_INTERRUPT_ENABLED == phydev->interrupts )
+	if (PHY_INTERRUPT_ENABLED == phydev->interrupts)
 		temp &= ~(MII_DM9161_INTR_STOP);
 	else
 		temp |= MII_DM9161_INTR_STOP;
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
@@ -851,8 +851,8 @@ static int match(struct sk_buff *skb, unsigned int type, struct rxts *rxts)
 
 	seqid = (u16 *)(data + offset + OFF_PTP_SEQUENCE_ID);
 
-	return (rxts->msgtype == (*msgtype & 0xf) &&
-		rxts->seqid   == ntohs(*seqid));
+	return rxts->msgtype == (*msgtype & 0xf) &&
+		rxts->seqid   == ntohs(*seqid);
 }
 
 static void dp83640_free_clocks(void)
diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c
@@ -48,7 +48,7 @@ MODULE_LICENSE("GPL");
 static int ip175c_config_init(struct phy_device *phydev)
 {
 	int err, i;
-	static int full_reset_performed = 0;
+	static int full_reset_performed;
 
 	if (full_reset_performed == 0) {
 
diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c
@@ -82,7 +82,7 @@ static int lxt970_config_intr(struct phy_device *phydev)
 {
 	int err;
 
-	if(phydev->interrupts == PHY_INTERRUPT_ENABLED)
+	if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
 		err = phy_write(phydev, MII_LXT970_IER, MII_LXT970_IER_IEN);
 	else
 		err = phy_write(phydev, MII_LXT970_IER, 0);
@@ -114,7 +114,7 @@ static int lxt971_config_intr(struct phy_device *phydev)
 {
 	int err;
 
-	if(phydev->interrupts == PHY_INTERRUPT_ENABLED)
+	if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
 		err = phy_write(phydev, MII_LXT971_IER, MII_LXT971_IER_IEN);
 	else
 		err = phy_write(phydev, MII_LXT971_IER, 0);
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
@@ -316,8 +316,8 @@ static int mdio_bus_match(struct device *dev, struct device_driver *drv)
 	if (phydrv->match_phy_device)
 		return phydrv->match_phy_device(phydev);
 
-	return ((phydrv->phy_id & phydrv->phy_id_mask) ==
-		(phydev->phy_id & phydrv->phy_id_mask));
+	return (phydrv->phy_id & phydrv->phy_id_mask) ==
+		(phydev->phy_id & phydrv->phy_id_mask);
 }
 
 #ifdef CONFIG_PM
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
@@ -81,14 +81,14 @@ static int ksz_config_flags(struct phy_device *phydev)
 }
 
 static int kszphy_extended_write(struct phy_device *phydev,
-                                 u32 regnum, u16 val)
+				u32 regnum, u16 val)
 {
 	phy_write(phydev, MII_KSZPHY_EXTREG, KSZPHY_EXTREG_WRITE | regnum);
 	return phy_write(phydev, MII_KSZPHY_EXTREG_WRITE, val);
 }
 
 static int kszphy_extended_read(struct phy_device *phydev,
-                                 u32 regnum)
+				u32 regnum)
 {
 	phy_write(phydev, MII_KSZPHY_EXTREG, regnum);
 	return phy_read(phydev, MII_KSZPHY_EXTREG_READ);
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
diff --git a/drivers/net/phy/spi_ks8995.c b/drivers/net/phy/spi_ks8995.c

Original file line number	Diff line number	Diff line change
`@@ -851,8 +851,8 @@ static int match(struct sk_buff skb, unsigned int type, struct rxts rxts)`
`851`	`851`
`852`	`852`	`seqid = (u16 *)(data + offset + OFF_PTP_SEQUENCE_ID);`
`853`	`853`
`854`		`- return (rxts->msgtype == (*msgtype & 0xf) &&`
`855`		`- rxts->seqid == ntohs(*seqid));`
	`854`	`+ return rxts->msgtype == (*msgtype & 0xf) &&`
	`855`	`+ rxts->seqid == ntohs(*seqid);`
`856`	`856`	`}`
`857`	`857`
`858`	`858`	`static void dp83640_free_clocks(void)`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ MODULE_LICENSE("GPL");`
`48`	`48`	`static int ip175c_config_init(struct phy_device *phydev)`
`49`	`49`	`{`
`50`	`50`	`int err, i;`
`51`		`- static int full_reset_performed = 0;`
	`51`	`+ static int full_reset_performed;`
`52`	`52`
`53`	`53`	`if (full_reset_performed == 0) {`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -316,8 +316,8 @@ static int mdio_bus_match(struct device dev, struct device_driver drv)`
`316`	`316`	`if (phydrv->match_phy_device)`
`317`	`317`	`return phydrv->match_phy_device(phydev);`
`318`	`318`
`319`		`- return ((phydrv->phy_id & phydrv->phy_id_mask) ==`
`320`		`- (phydev->phy_id & phydrv->phy_id_mask));`
	`319`	`+ return (phydrv->phy_id & phydrv->phy_id_mask) ==`
	`320`	`+ (phydev->phy_id & phydrv->phy_id_mask);`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`#ifdef CONFIG_PM`
Original file line number	Diff line number	Diff line change
`@@ -81,14 +81,14 @@ static int ksz_config_flags(struct phy_device *phydev)`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`static int kszphy_extended_write(struct phy_device *phydev,`
`84`		`- u32 regnum, u16 val)`
	`84`	`+ u32 regnum, u16 val)`
`85`	`85`	`{`
`86`	`86`	`phy_write(phydev, MII_KSZPHY_EXTREG, KSZPHY_EXTREG_WRITE \| regnum);`
`87`	`87`	`return phy_write(phydev, MII_KSZPHY_EXTREG_WRITE, val);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`static int kszphy_extended_read(struct phy_device *phydev,`
`91`		`- u32 regnum)`
	`91`	`+ u32 regnum)`
`92`	`92`	`{`
`93`	`93`	`phy_write(phydev, MII_KSZPHY_EXTREG, regnum);`
`94`	`94`	`return phy_read(phydev, MII_KSZPHY_EXTREG_READ);`