mlxsw: core_thermal: Remove unnecessary checks

idosch · kuba-moo · commit e7e3a450e552 · 2024-07-31T18:38:28.000-07:00
mlxsw_thermal_module_fini() cannot be invoked with a thermal module which is NULL or which is not associated with a thermal zone, so remove these checks. Signed-off-by: Ido Schimmel <idosch@nvidia.com> Reviewed-by: Vadim Pasternak <vadimp@nvidia.com> Signed-off-by: Petr Machata <petrm@nvidia.com> Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com> Link: https://patch.msgid.link/8db5fe0a3a28ba09a15d4102cc03f7e8ca7675be.1722345311.git.petrm@nvidia.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
@@ -467,11 +467,9 @@ mlxsw_thermal_module_init(struct mlxsw_thermal *thermal,
 
 static void mlxsw_thermal_module_fini(struct mlxsw_thermal_module *module_tz)
 {
-	if (module_tz && module_tz->tzdev) {
-		mlxsw_thermal_module_tz_fini(module_tz->tzdev);
-		module_tz->tzdev = NULL;
-		module_tz->parent = NULL;
-	}
+	mlxsw_thermal_module_tz_fini(module_tz->tzdev);
+	module_tz->tzdev = NULL;
+	module_tz->parent = NULL;
 }
 
 static int

Original file line number	Diff line number	Diff line change
`@@ -467,11 +467,9 @@ mlxsw_thermal_module_init(struct mlxsw_thermal *thermal,`
`467`	`467`
`468`	`468`	`static void mlxsw_thermal_module_fini(struct mlxsw_thermal_module *module_tz)`
`469`	`469`	`{`
`470`		`- if (module_tz && module_tz->tzdev) {`
`471`		`- mlxsw_thermal_module_tz_fini(module_tz->tzdev);`
`472`		`- module_tz->tzdev = NULL;`
`473`		`- module_tz->parent = NULL;`
`474`		`- }`
	`470`	`+ mlxsw_thermal_module_tz_fini(module_tz->tzdev);`
	`471`	`+ module_tz->tzdev = NULL;`
	`472`	`+ module_tz->parent = NULL;`
`475`	`473`	`}`
`476`	`474`
`477`	`475`	`static int`