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

Commit 56ad3152 authored by Michal Schmidt's avatar Michal Schmidt Committed by David S. Miller
Browse files

bnx2x: make bnx2x_close() static again 



Commit 8304859a "bnx2x: add fan failure event handling" made the function
bnx2x_close() non-static unnecessarily. The function is not called from
other sources. Make it static again.

Signed-off-by: default avatarMichal Schmidt <mschmidt@redhat.com>
Acked-by: default avatarYuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 32efe08d

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -2078,8 +2078,6 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms, 
#define BNX2X_VPD_LEN			128

#define BNX2X_VPD_LEN			128

#define VENDOR_ID_LEN			4

#define VENDOR_ID_LEN			4





int bnx2x_close(struct net_device *dev);



/* Congestion management fairness mode */

/* Congestion management fairness mode */

#define CMNG_FNS_NONE		0

#define CMNG_FNS_NONE		0

#define CMNG_FNS_MINMAX		1

#define CMNG_FNS_MINMAX		1

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -8711,6 +8711,8 @@ static void bnx2x_parity_recover(struct bnx2x *bp) 
	}

	}

}

}





static int bnx2x_close(struct net_device *dev);



/* bnx2x_nic_unload() flushes the bnx2x_wq, thus reset task is

/* bnx2x_nic_unload() flushes the bnx2x_wq, thus reset task is

 * scheduled on a general queue in order to prevent a dead lock.

 * scheduled on a general queue in order to prevent a dead lock.

 */

 */
@@ -10288,7 +10290,7 @@ static int bnx2x_open(struct net_device *dev) 
}

}





/* called with rtnl_lock */

/* called with rtnl_lock */

int bnx2x_close(struct net_device *dev)

static int bnx2x_close(struct net_device *dev)

{

{

	struct bnx2x *bp = netdev_priv(dev);

	struct bnx2x *bp = netdev_priv(dev);