* [PATCH] bnx2x: make bnx2x_close() static again
@ 2012-02-16 12:38 Michal Schmidt
[not found] ` <D4345541C14421439B1167B74C9F383537EEF3@SJEXCHMB05.corp.ad.broadcom.com>
0 siblings, 1 reply; 3+ messages in thread
From: Michal Schmidt @ 2012-02-16 12:38 UTC (permalink / raw)
To: netdev; +Cc: ariele, davem
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);
--
1.7.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: FW: [PATCH] bnx2x: make bnx2x_close() static again
[not found] ` <D4345541C14421439B1167B74C9F383537EEF3@SJEXCHMB05.corp.ad.broadcom.com>
@ 2012-02-16 13:35 ` Yuval Mintz
2012-02-20 0:05 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Yuval Mintz @ 2012-02-16 13:35 UTC (permalink / raw)
To: netdev, mschmidt; +Cc: davem, eilong
> 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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] bnx2x: make bnx2x_close() static again
2012-02-16 13:35 ` FW: " Yuval Mintz
@ 2012-02-20 0:05 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2012-02-20 0:05 UTC (permalink / raw)
To: yuvalmin; +Cc: netdev, mschmidt, eilong
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-02-20 0:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-16 12:38 [PATCH] bnx2x: make bnx2x_close() static again Michal Schmidt
[not found] ` <D4345541C14421439B1167B74C9F383537EEF3@SJEXCHMB05.corp.ad.broadcom.com>
2012-02-16 13:35 ` FW: " Yuval Mintz
2012-02-20 0:05 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).