bgmac: return error on failed PHY write
Subsystems (3)
PATCH 1/1 bgmac: return error on failed PHY write
Some callers may want to know if PHY write succeed. Also make PHY functions static, they are not exported anywhere.
Signed-off-by Rafał Miłecki <[email protected]>
--- drivers/net/ethernet/broadcom/bgmac.c | 10 +++++++--- drivers/net/ethernet/broadcom/bgmac.h | 3 --- 2 files changed, 7 insertions(+), 6 deletions(-)
drivers/net/ethernet/broadcom/bgmac.c +7 -3
@@ -535,7 +535,7 @@ static void bgmac_dma_init(struct bgmac *bgmac)* PHY ops **************************************************/ -u16 bgmac_phy_read (struct bgmac *bgmac,u8 phyaddr,u8 reg) +static u16 bgmac_phy_read (struct bgmac *bgmac,u8 phyaddr,u8 reg) {struct bcma_device *core;u16 phy_access_addr;
@@ -584,7 +584,7 @@ u16 bgmac_phy_read(struct bgmac *bgmac, u8 phyaddr, u8 reg) }/* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipphywr */ -void bgmac_phy_write (struct bgmac *bgmac,u8 phyaddr,u8 reg,u16 value) +static int bgmac_phy_write (struct bgmac *bgmac,u8 phyaddr,u8 reg,u16 value) {struct bcma_device *core;u16 phy_access_addr;
@@ -617,9 +617,13 @@ void bgmac_phy_write(struct bgmac *bgmac, u8 phyaddr, u8 reg, u16 value) tmp |= value;bcma_write32 (core, phy_access_addr, tmp); -if (!bgmac_wait_value (core, phy_access_addr,BGMAC_PA_START ,0 ,1000 )) +if (!bgmac_wait_value (core, phy_access_addr,BGMAC_PA_START ,0 ,1000 )) {bgmac_err (bgmac,"Writing to PHY %d register 0x%X failed\n" , phyaddr, reg); +return -ETIMEDOUT ; + } + +return 0 ; }/* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipphyforce */
drivers/net/ethernet/broadcom/bgmac.h +0 -3
@@ -450,7 +450,4 @@ static inline void bgmac_set(struct bgmac *bgmac, u16 offset, u32 set) bgmac_maskset(bgmac, offset, ~0, set); } -u16 bgmac_phy_read (struct bgmac *bgmac,u8 phyaddr,u8 reg); -void bgmac_phy_write (struct bgmac *bgmac,u8 phyaddr,u8 reg,u16 value); -#endif /* _BGMAC_H */
Signature · 1 line
1.7.10.4
From: Rafał Miłecki <[email protected]>
Date: Wed, 13 Feb 2013 10:14:51 +0100
Quoted 4 lines
Some callers may want to know if PHY write succeed. Also make PHY functions static, they are not exported anywhere.
Signed-off-by Rafał Miłecki <[email protected]>
Applied, thanks.