forked from Minki/linux
bnx2: annotate bp->phy_lock functions
It looks like the locking is OK as the locks were being taken before the various phy setup functions, add the annotations as they release and reacquire the phy_lock. Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
7be2df451f
commit
52d07b1f50
@ -1497,6 +1497,8 @@ static int bnx2_fw_sync(struct bnx2 *, u32, int, int);
|
||||
|
||||
static int
|
||||
bnx2_setup_remote_phy(struct bnx2 *bp, u8 port)
|
||||
__releases(&bp->phy_lock)
|
||||
__acquires(&bp->phy_lock)
|
||||
{
|
||||
u32 speed_arg = 0, pause_adv;
|
||||
|
||||
@ -1554,6 +1556,8 @@ bnx2_setup_remote_phy(struct bnx2 *bp, u8 port)
|
||||
|
||||
static int
|
||||
bnx2_setup_serdes_phy(struct bnx2 *bp, u8 port)
|
||||
__releases(&bp->phy_lock)
|
||||
__acquires(&bp->phy_lock)
|
||||
{
|
||||
u32 adv, bmcr;
|
||||
u32 new_adv = 0;
|
||||
@ -1866,6 +1870,8 @@ bnx2_set_remote_link(struct bnx2 *bp)
|
||||
|
||||
static int
|
||||
bnx2_setup_copper_phy(struct bnx2 *bp)
|
||||
__releases(&bp->phy_lock)
|
||||
__acquires(&bp->phy_lock)
|
||||
{
|
||||
u32 bmcr;
|
||||
u32 new_bmcr;
|
||||
@ -1963,6 +1969,8 @@ bnx2_setup_copper_phy(struct bnx2 *bp)
|
||||
|
||||
static int
|
||||
bnx2_setup_phy(struct bnx2 *bp, u8 port)
|
||||
__releases(&bp->phy_lock)
|
||||
__acquires(&bp->phy_lock)
|
||||
{
|
||||
if (bp->loopback == MAC_LOOPBACK)
|
||||
return 0;
|
||||
@ -2176,6 +2184,8 @@ bnx2_init_copper_phy(struct bnx2 *bp, int reset_phy)
|
||||
|
||||
static int
|
||||
bnx2_init_phy(struct bnx2 *bp, int reset_phy)
|
||||
__releases(&bp->phy_lock)
|
||||
__acquires(&bp->phy_lock)
|
||||
{
|
||||
u32 val;
|
||||
int rc = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user