eth: fbnic: rename fbnic_fw_clear_cmpl to fbnic_mbx_clear_cmpl

fbnic_fw_clear_cmpl() does the inverse of fbnic_mbx_set_cmpl().
It removes the completion from the mailbox table.
It also calls fbnic_mbx_set_cmpl_slot() internally.
It should have fbnic_mbx prefix, not fbnic_fw.
I'm not very clear on what the distinction is between the two
prefixes but the matching "set" and "clear" functions should
use the same prefix.

While at it move the "clear" function closer to the "set".

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250624142834.3275164-6-kuba@kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_devlink.c b/drivers/net/ethernet/meta/fbnic/fbnic_devlink.c
index 4c4938eedd7bf9496a33fc19c60979d43548a542..c5f81f139e7edaf326fb363314f17f276b3b5356 100644 (file)
--- a/drivers/net/ethernet/meta/fbnic/fbnic_devlink.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_devlink.c
@@ -182,7 +182,7 @@ fbnic_flash_start(struct fbnic_dev *fbd, struct pldmfw_component *component)
        else
                err = -ETIMEDOUT;
 
-       fbnic_fw_clear_cmpl(fbd, cmpl);
+       fbnic_mbx_clear_cmpl(fbd, cmpl);
 cmpl_free:
        fbnic_fw_put_cmpl(cmpl);
 
@@ -300,7 +300,7 @@ err_no_msg:
                                                   component_name, 0, 0);
        }
 
-       fbnic_fw_clear_cmpl(fbd, cmpl);
+       fbnic_mbx_clear_cmpl(fbd, cmpl);
 cmpl_free:
        fbnic_fw_put_cmpl(cmpl);
 

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_fw.c b/drivers/net/ethernet/meta/fbnic/fbnic_fw.c
index ab58572c27aab2f02e8273cbcce297282216b260..1d220d8369e7397f52fd09d00ccc2ded29cb2dfd 100644 (file)
--- a/drivers/net/ethernet/meta/fbnic/fbnic_fw.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_fw.c
@@ -338,6 +338,16 @@ unlock_mbx:
        return err;
 }
 
+void fbnic_mbx_clear_cmpl(struct fbnic_dev *fbd,
+                         struct fbnic_fw_completion *fw_cmpl)
+{
+       unsigned long flags;
+
+       spin_lock_irqsave(&fbd->fw_tx_lock, flags);
+       fbnic_mbx_clear_cmpl_slot(fbd, fw_cmpl);
+       spin_unlock_irqrestore(&fbd->fw_tx_lock, flags);
+}
+
 static void fbnic_fw_release_cmpl_data(struct kref *kref)
 {
        struct fbnic_fw_completion *cmpl_data;
@@ -1263,16 +1273,6 @@ struct fbnic_fw_completion *fbnic_fw_alloc_cmpl(u32 msg_type)
        return cmpl;
 }
 
-void fbnic_fw_clear_cmpl(struct fbnic_dev *fbd,
-                        struct fbnic_fw_completion *fw_cmpl)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&fbd->fw_tx_lock, flags);
-       fbnic_mbx_clear_cmpl_slot(fbd, fw_cmpl);
-       spin_unlock_irqrestore(&fbd->fw_tx_lock, flags);
-}
-
 void fbnic_fw_put_cmpl(struct fbnic_fw_completion *fw_cmpl)
 {
        kref_put(&fw_cmpl->ref_count, fbnic_fw_release_cmpl_data);

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_fw.h b/drivers/net/ethernet/meta/fbnic/fbnic_fw.h
index f3ed65cf976aad5b8e3e9f4742009b94ad1be15f..555b231b38c12be652def2ad5ef70d780c0ad971 100644 (file)
--- a/drivers/net/ethernet/meta/fbnic/fbnic_fw.h
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_fw.h
@@ -66,6 +66,8 @@ void fbnic_mbx_init(struct fbnic_dev *fbd);
 void fbnic_mbx_clean(struct fbnic_dev *fbd);
 int fbnic_mbx_set_cmpl(struct fbnic_dev *fbd,
                       struct fbnic_fw_completion *cmpl_data);
+void fbnic_mbx_clear_cmpl(struct fbnic_dev *fbd,
+                         struct fbnic_fw_completion *cmpl_data);
 void fbnic_mbx_poll(struct fbnic_dev *fbd);
 int fbnic_mbx_poll_tx_ready(struct fbnic_dev *fbd);
 void fbnic_mbx_flush_tx(struct fbnic_dev *fbd);
@@ -81,8 +83,6 @@ int fbnic_fw_xmit_fw_write_chunk(struct fbnic_dev *fbd,
 int fbnic_fw_xmit_tsene_read_msg(struct fbnic_dev *fbd,
                                 struct fbnic_fw_completion *cmpl_data);
 struct fbnic_fw_completion *fbnic_fw_alloc_cmpl(u32 msg_type);
-void fbnic_fw_clear_cmpl(struct fbnic_dev *fbd,
-                        struct fbnic_fw_completion *cmpl_data);
 void fbnic_fw_put_cmpl(struct fbnic_fw_completion *cmpl_data);
 
 #define fbnic_mk_full_fw_ver_str(_rev_id, _delim, _commit, _str, _str_sz) \

diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_mac.c b/drivers/net/ethernet/meta/fbnic/fbnic_mac.c
index 5ff45463f9d2a467ecde1326b809815a8c994a5b..fd8d67f9048e827913ae231203ac07a5fbd430ff 100644 (file)
--- a/drivers/net/ethernet/meta/fbnic/fbnic_mac.c
+++ b/drivers/net/ethernet/meta/fbnic/fbnic_mac.c
@@ -796,7 +796,7 @@ static int fbnic_mac_get_sensor_asic(struct fbnic_dev *fbd, int id,
 
        *val = *sensor;
 exit_cleanup:
-       fbnic_fw_clear_cmpl(fbd, fw_cmpl);
+       fbnic_mbx_clear_cmpl(fbd, fw_cmpl);
 exit_free:
        fbnic_fw_put_cmpl(fw_cmpl);