Message ID | 1329395928-998-1-git-send-email-mschmidt@redhat.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
> Subject: [PATCH] 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: Michal Schmidt <mschmidt@redhat.com> > --- > drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 -- > drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 +++- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h > index 7d184fb..5d7e4bc 100644 > --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h > +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h > @@ -2074,8 +2074,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/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c > index ff19c3c..80cae51 100644 > --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c > +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c > @@ -8719,6 +8719,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. > */ > @@ -10291,7 +10293,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); > Acked-by: Yuval Mintz <yuvalmin@broadcom.com> Thanks Michal. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: "Yuval Mintz" <yuvalmin@broadcom.com> Date: Thu, 16 Feb 2012 15:35:40 +0200 >> Subject: [PATCH] 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: Michal Schmidt <mschmidt@redhat.com> ... > Acked-by: Yuval Mintz <yuvalmin@broadcom.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h index 7d184fb..5d7e4bc 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h @@ -2074,8 +2074,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/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index ff19c3c..80cae51 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -8719,6 +8719,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. */ @@ -10291,7 +10293,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);
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: Michal Schmidt <mschmidt@redhat.com> --- drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 -- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-)