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

Commit cea883bb authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'phy_checkpatch' 



Florian Fainelli says:

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

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a58f7f8a 7aff9675

drivers/net/phy/dp83640.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

drivers/net/phy/icplus.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

drivers/net/phy/mdio_bus.c

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/net/phy/spi_ks8995.c

+2 −2
Original line number Diff line number Diff line
@@ -171,14 +171,14 @@ static int ks8995_write(struct ks8995_switch *ks, char *buf, 


static inline int ks8995_read_reg(struct ks8995_switch *ks, u8 addr, u8 *buf)

{

	return (ks8995_read(ks, buf, addr, 1) != 1);

	return ks8995_read(ks, buf, addr, 1) != 1;

}



static inline int ks8995_write_reg(struct ks8995_switch *ks, u8 addr, u8 val)

{

	char buf = val;



	return (ks8995_write(ks, &buf, addr, 1) != 1);

	return ks8995_write(ks, &buf, addr, 1) != 1;

}



/* ------------------------------------------------------------------------ */

drivers/net/phy/lxt.c

+2 −2

File changed.

Contains only whitespace changes.

drivers/net/phy/phy.c

+132 −132

File changed.

Contains only whitespace changes.

drivers/net/phy/phy_device.c

+7 −7

File changed.

Contains only whitespace changes.

drivers/net/phy/cicada.c

+2 −2

File changed.

Contains only whitespace changes.

drivers/net/phy/micrel.c

+2 −2

File changed.

Contains only whitespace changes.

drivers/net/phy/davicom.c

+1 −1

File changed.

Contains only whitespace changes.