From: Michal Schmidt Date: Thu, 16 Feb 2012 02:38:48 +0000 (+0000) Subject: bnx2x: make bnx2x_close() static again X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~476 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3b2008da0bd873df7372f8904f7394d9ec8f6993;p=users%2Fjedix%2Flinux-maple.git 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. (cherry picked from commit 56ad315250bec1cd239c18712e072d1ff1f4aaf3) Signed-off-by: Michal Schmidt Acked-by: Yuval Mintz Signed-off-by: David S. Miller Signed-off-by: Joe Jin --- diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h index 29cfe548f23e..cdb6820d59f7 100644 --- a/drivers/net/bnx2x/bnx2x.h +++ b/drivers/net/bnx2x/bnx2x.h @@ -2009,8 +2009,6 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms, #define BNX2X_VPD_LEN 128 #define VENDOR_ID_LEN 4 -int bnx2x_close(struct net_device *dev); - /* Congestion management fairness mode */ #define CMNG_FNS_NONE 0 #define CMNG_FNS_MINMAX 1 diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c index 2b3ec2e15bc3..3b0ef152da6e 100644 --- a/drivers/net/bnx2x/bnx2x_main.c +++ b/drivers/net/bnx2x/bnx2x_main.c @@ -8654,6 +8654,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 * scheduled on a general queue in order to prevent a dead lock. */ @@ -10229,7 +10231,7 @@ static int bnx2x_open(struct net_device *dev) } /* 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);