mlxsw: reg: Remove unused function argument

The 'lock' argument is always set to the default value of '0'. Remove it
from the arguments list.

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Petr Machata <petrm@nvidia.com>
Link: https://lore.kernel.org/r/fb5dd22830622ceeda1c2d6431c27fccd0687aca.1690281940.git.petrm@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_env.c b/drivers/net/ethernet/mellanox/mlxsw/core_env.c
index 0107cbc32fc7635ce58049451bc7df5da62fa1aa..679f7488ba10fcb07098c5672234a37ed7bc4de3 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core_env.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_env.c
@@ -111,7 +111,7 @@ mlxsw_env_validate_cable_ident(struct mlxsw_core *core, u8 slot_index, int id,
        if (err)
                return err;
 
-       mlxsw_reg_mcia_pack(mcia_pl, slot_index, id, 0,
+       mlxsw_reg_mcia_pack(mcia_pl, slot_index, id,
                            MLXSW_REG_MCIA_PAGE0_LO_OFF, 0, 1,
                            MLXSW_REG_MCIA_I2C_ADDR_LOW);
        err = mlxsw_reg_query(core, MLXSW_REG(mcia), mcia_pl);
@@ -188,7 +188,7 @@ mlxsw_env_query_module_eeprom(struct mlxsw_core *mlxsw_core, u8 slot_index,
                }
        }
 
-       mlxsw_reg_mcia_pack(mcia_pl, slot_index, module, 0, page, offset, size,
+       mlxsw_reg_mcia_pack(mcia_pl, slot_index, module, page, offset, size,
                            i2c_addr);
 
        err = mlxsw_reg_query(mlxsw_core, MLXSW_REG(mcia), mcia_pl);
@@ -266,12 +266,12 @@ mlxsw_env_module_temp_thresholds_get(struct mlxsw_core *core, u8 slot_index,
                        page = MLXSW_REG_MCIA_TH_PAGE_CMIS_NUM;
                else
                        page = MLXSW_REG_MCIA_TH_PAGE_NUM;
-               mlxsw_reg_mcia_pack(mcia_pl, slot_index, module, 0, page,
+               mlxsw_reg_mcia_pack(mcia_pl, slot_index, module, page,
                                    MLXSW_REG_MCIA_TH_PAGE_OFF + off,
                                    MLXSW_REG_MCIA_TH_ITEM_SIZE,
                                    MLXSW_REG_MCIA_I2C_ADDR_LOW);
        } else {
-               mlxsw_reg_mcia_pack(mcia_pl, slot_index, module, 0,
+               mlxsw_reg_mcia_pack(mcia_pl, slot_index, module,
                                    MLXSW_REG_MCIA_PAGE0_LO,
                                    off, MLXSW_REG_MCIA_TH_ITEM_SIZE,
                                    MLXSW_REG_MCIA_I2C_ADDR_HIGH);
@@ -491,7 +491,7 @@ mlxsw_env_get_module_eeprom_by_page(struct mlxsw_core *mlxsw_core,
                size = min_t(u8, page->length - bytes_read,
                             MLXSW_REG_MCIA_EEPROM_SIZE);
 
-               mlxsw_reg_mcia_pack(mcia_pl, slot_index, module, 0, page->page,
+               mlxsw_reg_mcia_pack(mcia_pl, slot_index, module, page->page,
                                    device_addr + bytes_read, size,
                                    page->i2c_address);
                mlxsw_reg_mcia_bank_number_set(mcia_pl, page->bank);

diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h
index d2391707dc0437a889fa78b2c8f58b3207f51a8f..3b297797ced407361bca300fdcc57f1d06c86ef2 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h
@@ -9644,14 +9644,6 @@ static inline void mlxsw_reg_mtbr_temp_unpack(char *payload, int rec_ind,
 
 MLXSW_REG_DEFINE(mcia, MLXSW_REG_MCIA_ID, MLXSW_REG_MCIA_LEN);
 
-/* reg_mcia_l
- * Lock bit. Setting this bit will lock the access to the specific
- * cable. Used for updating a full page in a cable EPROM. Any access
- * other then subsequence writes will fail while the port is locked.
- * Access: RW
- */
-MLXSW_ITEM32(reg, mcia, l, 0x00, 31, 1);
-
 /* reg_mcia_module
  * Module number.
  * Access: Index
@@ -9764,14 +9756,12 @@ MLXSW_ITEM_BUF(reg, mcia, eeprom, 0x10, MLXSW_REG_MCIA_EEPROM_SIZE);
                                MLXSW_REG_MCIA_EEPROM_UP_PAGE_LENGTH + 1)
 
 static inline void mlxsw_reg_mcia_pack(char *payload, u8 slot_index, u8 module,
-                                      u8 lock, u8 page_number,
-                                      u16 device_addr, u8 size,
+                                      u8 page_number, u16 device_addr, u8 size,
                                       u8 i2c_device_addr)
 {
        MLXSW_REG_ZERO(mcia, payload);
        mlxsw_reg_mcia_slot_set(payload, slot_index);
        mlxsw_reg_mcia_module_set(payload, module);
-       mlxsw_reg_mcia_l_set(payload, lock);
        mlxsw_reg_mcia_page_number_set(payload, page_number);
        mlxsw_reg_mcia_device_address_set(payload, device_addr);
        mlxsw_reg_mcia_size_set(payload, size);