RDMA/bnxt_re: Eliminate need for some forward declarations

Move the function definition of bnxt_re_shutdown() to avoid
forward declarartion of bnxt_re_dev_uninit().

Move the function definition of bnxt_re_setup_cc() before
bnxt_re_add_device() to avoid it's forward declarations.

Also, forward declarartions of bnxt_re_stop_irq() and
bnxt_re_dev_stop() are unnecessary.

Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com>
Link: https://patch.msgid.link/1733888745-30939-5-git-send-email-selvin.xavier@broadcom.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>

diff --git a/drivers/infiniband/hw/bnxt_re/main.c b/drivers/infiniband/hw/bnxt_re/main.c
index 75e1611fc3ed07aec951ae440c0951d7f1a21c79..5e10b540329a0c0cbc20eb7b1fa701df37326898 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/main.c
+++ b/drivers/infiniband/hw/bnxt_re/main.c
@@ -79,17 +79,12 @@ MODULE_LICENSE("Dual BSD/GPL");
 /* globals */
 static DEFINE_MUTEX(bnxt_re_mutex);
 
-static void bnxt_re_stop_irq(void *handle);
-static void bnxt_re_dev_stop(struct bnxt_re_dev *rdev);
 static int bnxt_re_netdev_event(struct notifier_block *notifier,
                                unsigned long event, void *ptr);
-static struct bnxt_re_dev *bnxt_re_from_netdev(struct net_device *netdev);
-static void bnxt_re_dev_uninit(struct bnxt_re_dev *rdev, u8 op_type);
 static int bnxt_re_hwrm_qcaps(struct bnxt_re_dev *rdev);
 
 static int bnxt_re_hwrm_qcfg(struct bnxt_re_dev *rdev, u32 *db_len,
                             u32 *offset);
-static void bnxt_re_setup_cc(struct bnxt_re_dev *rdev, bool enable);
 static void bnxt_re_set_db_offset(struct bnxt_re_dev *rdev)
 {
        struct bnxt_qplib_chip_ctx *cctx;
@@ -302,16 +297,6 @@ static void bnxt_re_vf_res_config(struct bnxt_re_dev *rdev)
                                      &rdev->qplib_ctx);
 }
 
-static void bnxt_re_shutdown(struct auxiliary_device *adev)
-{
-       struct bnxt_re_en_dev_info *en_info = auxiliary_get_drvdata(adev);
-       struct bnxt_re_dev *rdev;
-
-       rdev = en_info->rdev;
-       ib_unregister_device(&rdev->ibdev);
-       bnxt_re_dev_uninit(rdev, BNXT_RE_COMPLETE_REMOVE);
-}
-
 static void bnxt_re_stop_irq(void *handle)
 {
        struct bnxt_re_en_dev_info *en_info = auxiliary_get_drvdata(handle);
@@ -2123,6 +2108,30 @@ fail:
        return rc;
 }
 
+static void bnxt_re_setup_cc(struct bnxt_re_dev *rdev, bool enable)
+{
+       struct bnxt_qplib_cc_param cc_param = {};
+
+       /* Do not enable congestion control on VFs */
+       if (rdev->is_virtfn)
+               return;
+
+       /* Currently enabling only for GenP5 adapters */
+       if (!bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))
+               return;
+
+       if (enable) {
+               cc_param.enable  = 1;
+               cc_param.tos_ecn = 1;
+       }
+
+       cc_param.mask = (CMDQ_MODIFY_ROCE_CC_MODIFY_MASK_ENABLE_CC |
+                        CMDQ_MODIFY_ROCE_CC_MODIFY_MASK_TOS_ECN);
+
+       if (bnxt_qplib_modify_cc(&rdev->qplib_res, &cc_param))
+               ibdev_err(&rdev->ibdev, "Failed to setup CC enable = %d\n", enable);
+}
+
 static void bnxt_re_update_en_info_rdev(struct bnxt_re_dev *rdev,
                                        struct bnxt_re_en_dev_info *en_info,
                                        struct auxiliary_device *adev)
@@ -2192,30 +2201,6 @@ exit:
        return rc;
 }
 
-static void bnxt_re_setup_cc(struct bnxt_re_dev *rdev, bool enable)
-{
-       struct bnxt_qplib_cc_param cc_param = {};
-
-       /* Do not enable congestion control on VFs */
-       if (rdev->is_virtfn)
-               return;
-
-       /* Currently enabling only for GenP5 adapters */
-       if (!bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))
-               return;
-
-       if (enable) {
-               cc_param.enable  = 1;
-               cc_param.tos_ecn = 1;
-       }
-
-       cc_param.mask = (CMDQ_MODIFY_ROCE_CC_MODIFY_MASK_ENABLE_CC |
-                        CMDQ_MODIFY_ROCE_CC_MODIFY_MASK_TOS_ECN);
-
-       if (bnxt_qplib_modify_cc(&rdev->qplib_res, &cc_param))
-               ibdev_err(&rdev->ibdev, "Failed to setup CC enable = %d\n", enable);
-}
-
 /*
  * "Notifier chain callback can be invoked for the same chain from
  * different CPUs at the same time".
@@ -2376,6 +2361,16 @@ static int bnxt_re_resume(struct auxiliary_device *adev)
        return 0;
 }
 
+static void bnxt_re_shutdown(struct auxiliary_device *adev)
+{
+       struct bnxt_re_en_dev_info *en_info = auxiliary_get_drvdata(adev);
+       struct bnxt_re_dev *rdev;
+
+       rdev = en_info->rdev;
+       ib_unregister_device(&rdev->ibdev);
+       bnxt_re_dev_uninit(rdev, BNXT_RE_COMPLETE_REMOVE);
+}
+
 static const struct auxiliary_device_id bnxt_re_id_table[] = {
        { .name = BNXT_ADEV_NAME ".rdma", },
        {},