mlxsw: core_thermal: Use exact name of cooling devices for binding

vadimp-nvidia · davem330 · commit 739d56bc635e · 2022-04-15T11:06:13.000+01:00
Modular system supports additional cooling devices "mlxreg_fan1",
"mlxreg_fan2", etcetera. Thermal zones in "mlxsw" driver should be
bound to the same device as before called "mlxreg_fan". Used exact
match for cooling device name to avoid binding to new additional
cooling devices.

Signed-off-by: Vadim Pasternak &lt;vadimp@nvidia.com&gt;
Signed-off-by: Ido Schimmel &lt;idosch@nvidia.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
@@ -129,8 +129,7 @@ static int mlxsw_get_cooling_device_idx(struct mlxsw_thermal *thermal,
 
 	/* Allow mlxsw thermal zone binding to an external cooling device */
 	for (i = 0; i < ARRAY_SIZE(mlxsw_thermal_external_allowed_cdev); i++) {
-		if (strnstr(cdev->type, mlxsw_thermal_external_allowed_cdev[i],
-			    strlen(cdev->type)))
+		if (!strcmp(cdev->type, mlxsw_thermal_external_allowed_cdev[i]))
 			return 0;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,7 @@ static int mlxsw_get_cooling_device_idx(struct mlxsw_thermal *thermal,`
`129`	`129`
`130`	`130`	`/* Allow mlxsw thermal zone binding to an external cooling device */`
`131`	`131`	`for (i = 0; i < ARRAY_SIZE(mlxsw_thermal_external_allowed_cdev); i++) {`
`132`		`- if (strnstr(cdev->type, mlxsw_thermal_external_allowed_cdev[i],`
`133`		`- strlen(cdev->type)))`
	`132`	`+ if (!strcmp(cdev->type, mlxsw_thermal_external_allowed_cdev[i]))`
`134`	`133`	`return 0;`
`135`	`134`	`}`
`136`	`135`