lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'phy_checkpatch'

Browse Source 
Florian Fainelli says:

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

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

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2013-12-18 00:49:35 -05:00
parent a58f7f8a61 7aff967581
commit cea883bb68
10 changed files with 168 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/phy/dp83640.c
View File

@@ -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); seqid = (u16 *)(data + offset + OFF_PTP_SEQUENCE_ID);
return (rxts->msgtype == (*msgtype & 0xf) && return rxts->msgtype == (*msgtype & 0xf) &&
rxts->seqid == ntohs(*seqid)); rxts->seqid == ntohs(*seqid);
} }
static void dp83640_free_clocks(void) static void dp83640_free_clocks(void)

2
drivers/net/phy/icplus.c
View File

@@ -48,7 +48,7 @@ MODULE_LICENSE("GPL");
static int ip175c_config_init(struct phy_device *phydev) static int ip175c_config_init(struct phy_device *phydev)
{ {
int err, i; int err, i;
static int full_reset_performed = 0; static int full_reset_performed;
if (full_reset_performed == 0) { if (full_reset_performed == 0) {

4
drivers/net/phy/mdio_bus.c
View File

@@ -316,8 +316,8 @@ static int mdio_bus_match(struct device *dev, struct device_driver *drv)
if (phydrv->match_phy_device) if (phydrv->match_phy_device)
return phydrv->match_phy_device(phydev); return phydrv->match_phy_device(phydev);
return ((phydrv->phy_id & phydrv->phy_id_mask) == return (phydrv->phy_id & phydrv->phy_id_mask) ==
(phydev->phy_id & phydrv->phy_id_mask)); (phydev->phy_id & phydrv->phy_id_mask);
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM

4
drivers/net/phy/spi_ks8995.c
View File

@@ -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) 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) static inline int ks8995_write_reg(struct ks8995_switch *ks, u8 addr, u8 val)
{ {
char buf = val; char buf = val;
return (ks8995_write(ks, &buf, addr, 1) != 1); return ks8995_write(ks, &buf, addr, 1) != 1;
} }
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */