diff options
author | Michael Chan <michael.chan@broadcom.com> | 2018-09-03 04:23:18 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-09-04 00:59:43 -0400 |
commit | ad95c27bdb930105f3eea02621bda157caf2862d (patch) | |
tree | 5ee044c6e231287c6ccf5666237e0cbc10149c35 | |
parent | 6b95c3e9697254dab0c8eafc6ab9d5e10d2eca4e (diff) |
bnxt_en: Clean up unused functions.
Remove unused bnxt_subtract_ulp_resources(). Change
bnxt_get_max_func_irqs() to static since it is only locally used.
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 15 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 1 |
4 files changed, 1 insertions, 18 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 6a1baf375ac3..6472ce447f87 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c | |||
@@ -5918,7 +5918,7 @@ void bnxt_set_max_func_cp_rings(struct bnxt *bp, unsigned int max) | |||
5918 | bp->hw_resc.max_cp_rings = max; | 5918 | bp->hw_resc.max_cp_rings = max; |
5919 | } | 5919 | } |
5920 | 5920 | ||
5921 | unsigned int bnxt_get_max_func_irqs(struct bnxt *bp) | 5921 | static unsigned int bnxt_get_max_func_irqs(struct bnxt *bp) |
5922 | { | 5922 | { |
5923 | struct bnxt_hw_resc *hw_resc = &bp->hw_resc; | 5923 | struct bnxt_hw_resc *hw_resc = &bp->hw_resc; |
5924 | 5924 | ||
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h index fefa011320e0..c4c77b9fa77b 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h | |||
@@ -1482,7 +1482,6 @@ unsigned int bnxt_get_max_func_stat_ctxs(struct bnxt *bp); | |||
1482 | void bnxt_set_max_func_stat_ctxs(struct bnxt *bp, unsigned int max); | 1482 | void bnxt_set_max_func_stat_ctxs(struct bnxt *bp, unsigned int max); |
1483 | unsigned int bnxt_get_max_func_cp_rings(struct bnxt *bp); | 1483 | unsigned int bnxt_get_max_func_cp_rings(struct bnxt *bp); |
1484 | void bnxt_set_max_func_cp_rings(struct bnxt *bp, unsigned int max); | 1484 | void bnxt_set_max_func_cp_rings(struct bnxt *bp, unsigned int max); |
1485 | unsigned int bnxt_get_max_func_irqs(struct bnxt *bp); | ||
1486 | int bnxt_get_avail_msix(struct bnxt *bp, int num); | 1485 | int bnxt_get_avail_msix(struct bnxt *bp, int num); |
1487 | int bnxt_reserve_rings(struct bnxt *bp); | 1486 | int bnxt_reserve_rings(struct bnxt *bp); |
1488 | void bnxt_tx_disable(struct bnxt *bp); | 1487 | void bnxt_tx_disable(struct bnxt *bp); |
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c index c37b2842f972..deac73e8e0f7 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | |||
@@ -220,21 +220,6 @@ int bnxt_get_ulp_msix_base(struct bnxt *bp) | |||
220 | return 0; | 220 | return 0; |
221 | } | 221 | } |
222 | 222 | ||
223 | void bnxt_subtract_ulp_resources(struct bnxt *bp, int ulp_id) | ||
224 | { | ||
225 | ASSERT_RTNL(); | ||
226 | if (bnxt_ulp_registered(bp->edev, ulp_id)) { | ||
227 | struct bnxt_en_dev *edev = bp->edev; | ||
228 | unsigned int msix_req, max; | ||
229 | |||
230 | msix_req = edev->ulp_tbl[ulp_id].msix_requested; | ||
231 | max = bnxt_get_max_func_cp_rings(bp); | ||
232 | bnxt_set_max_func_cp_rings(bp, max - msix_req); | ||
233 | max = bnxt_get_max_func_stat_ctxs(bp); | ||
234 | bnxt_set_max_func_stat_ctxs(bp, max - 1); | ||
235 | } | ||
236 | } | ||
237 | |||
238 | static int bnxt_send_msg(struct bnxt_en_dev *edev, int ulp_id, | 223 | static int bnxt_send_msg(struct bnxt_en_dev *edev, int ulp_id, |
239 | struct bnxt_fw_msg *fw_msg) | 224 | struct bnxt_fw_msg *fw_msg) |
240 | { | 225 | { |
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h index df48ac71729f..d9bea37cd211 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | |||
@@ -90,7 +90,6 @@ static inline bool bnxt_ulp_registered(struct bnxt_en_dev *edev, int ulp_id) | |||
90 | 90 | ||
91 | int bnxt_get_ulp_msix_num(struct bnxt *bp); | 91 | int bnxt_get_ulp_msix_num(struct bnxt *bp); |
92 | int bnxt_get_ulp_msix_base(struct bnxt *bp); | 92 | int bnxt_get_ulp_msix_base(struct bnxt *bp); |
93 | void bnxt_subtract_ulp_resources(struct bnxt *bp, int ulp_id); | ||
94 | void bnxt_ulp_stop(struct bnxt *bp); | 93 | void bnxt_ulp_stop(struct bnxt *bp); |
95 | void bnxt_ulp_start(struct bnxt *bp); | 94 | void bnxt_ulp_start(struct bnxt *bp); |
96 | void bnxt_ulp_sriov_cfg(struct bnxt *bp, int num_vfs); | 95 | void bnxt_ulp_sriov_cfg(struct bnxt *bp, int num_vfs); |