Commit fb76ea1d authored by Ido Schimmel's avatar Ido Schimmel Committed by Jakub Kicinski
Browse files

mlxsw: core_thermal: Make mlxsw_thermal_module_{init, fini} symmetric 



mlxsw_thermal_module_fini() de-initializes the module's thermal zone,
but mlxsw_thermal_module_init() does not initialize it. Make both
functions symmetric by moving the initialization of the module's thermal
zone to mlxsw_thermal_module_init().

Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Reviewed-by: default avatarVadim Pasternak <vadimp@nvidia.com>
Signed-off-by: default avatarPetr Machata <petrm@nvidia.com>
Reviewed-by: default avatarWojciech Drewek <wojciech.drewek@intel.com>
Link: https://patch.msgid.link/a661ad468f8ad0d7d533d8334e4abf61dfe34342.1722345311.git.petrm@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 73c18f99

drivers/net/ethernet/mellanox/mlxsw/core_thermal.c

+6 −7
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ static void mlxsw_thermal_module_tz_fini(struct thermal_zone_device *tzdev) 
	thermal_zone_device_unregister(tzdev);

}



static void

static int

mlxsw_thermal_module_init(struct mlxsw_thermal *thermal,

			  struct mlxsw_thermal_area *area, u8 module)

{
@@ -461,6 +461,8 @@ mlxsw_thermal_module_init(struct mlxsw_thermal *thermal, 
	       sizeof(thermal->trips));

	memcpy(module_tz->cooling_states, default_cooling_states,

	       sizeof(thermal->cooling_states));



	return mlxsw_thermal_module_tz_init(module_tz);

}



static void mlxsw_thermal_module_fini(struct mlxsw_thermal_module *module_tz)
@@ -477,7 +479,6 @@ mlxsw_thermal_modules_init(struct device *dev, struct mlxsw_core *core, 
			   struct mlxsw_thermal *thermal,

			   struct mlxsw_thermal_area *area)

{

	struct mlxsw_thermal_module *module_tz;

	char mgpir_pl[MLXSW_REG_MGPIR_LEN];

	int i, err;
@@ -500,16 +501,14 @@ mlxsw_thermal_modules_init(struct device *dev, struct mlxsw_core *core, 
		return -ENOMEM;



	for (i = 0; i < area->tz_module_num; i++) {

		mlxsw_thermal_module_init(thermal, area, i);

		module_tz = &area->tz_module_arr[i];

		err = mlxsw_thermal_module_tz_init(module_tz);

		err = mlxsw_thermal_module_init(thermal, area, i);

		if (err)

			goto err_thermal_module_tz_init;

			goto err_thermal_module_init;

	}



	return 0;



err_thermal_module_tz_init:

err_thermal_module_init:

	for (i = area->tz_module_num - 1; i >= 0; i--)

		mlxsw_thermal_module_fini(&area->tz_module_arr[i]);

	kfree(area->tz_module_arr);