aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/bnx2.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index e817802b2483..fe575b9a9b73 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -1497,6 +1497,8 @@ static int bnx2_fw_sync(struct bnx2 *, u32, int, int);
1497 1497
1498static int 1498static int
1499bnx2_setup_remote_phy(struct bnx2 *bp, u8 port) 1499bnx2_setup_remote_phy(struct bnx2 *bp, u8 port)
1500__releases(&bp->phy_lock)
1501__acquires(&bp->phy_lock)
1500{ 1502{
1501 u32 speed_arg = 0, pause_adv; 1503 u32 speed_arg = 0, pause_adv;
1502 1504
@@ -1554,6 +1556,8 @@ bnx2_setup_remote_phy(struct bnx2 *bp, u8 port)
1554 1556
1555static int 1557static int
1556bnx2_setup_serdes_phy(struct bnx2 *bp, u8 port) 1558bnx2_setup_serdes_phy(struct bnx2 *bp, u8 port)
1559__releases(&bp->phy_lock)
1560__acquires(&bp->phy_lock)
1557{ 1561{
1558 u32 adv, bmcr; 1562 u32 adv, bmcr;
1559 u32 new_adv = 0; 1563 u32 new_adv = 0;
@@ -1866,6 +1870,8 @@ bnx2_set_remote_link(struct bnx2 *bp)
1866 1870
1867static int 1871static int
1868bnx2_setup_copper_phy(struct bnx2 *bp) 1872bnx2_setup_copper_phy(struct bnx2 *bp)
1873__releases(&bp->phy_lock)
1874__acquires(&bp->phy_lock)
1869{ 1875{
1870 u32 bmcr; 1876 u32 bmcr;
1871 u32 new_bmcr; 1877 u32 new_bmcr;
@@ -1963,6 +1969,8 @@ bnx2_setup_copper_phy(struct bnx2 *bp)
1963 1969
1964static int 1970static int
1965bnx2_setup_phy(struct bnx2 *bp, u8 port) 1971bnx2_setup_phy(struct bnx2 *bp, u8 port)
1972__releases(&bp->phy_lock)
1973__acquires(&bp->phy_lock)
1966{ 1974{
1967 if (bp->loopback == MAC_LOOPBACK) 1975 if (bp->loopback == MAC_LOOPBACK)
1968 return 0; 1976 return 0;
@@ -2176,6 +2184,8 @@ bnx2_init_copper_phy(struct bnx2 *bp, int reset_phy)
2176 2184
2177static int 2185static int
2178bnx2_init_phy(struct bnx2 *bp, int reset_phy) 2186bnx2_init_phy(struct bnx2 *bp, int reset_phy)
2187__releases(&bp->phy_lock)
2188__acquires(&bp->phy_lock)
2179{ 2189{
2180 u32 val; 2190 u32 val;
2181 int rc = 0; 2191 int rc = 0;