| Message ID | cceb7f8864c43f046cf1c19c3bbcc38a7a57adc5.1740426540.git.christophe.jaillet@wanadoo.fr |
|---|---|
| State | New |
| Headers | show |
| Series | thermal: intel: Remove a useless operation in int340x_thermal_zone_add() | expand |
On Mon, Feb 24, 2025 at 8:50 PM Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote: > > 'zone_trips' has just been allocated with kzalloc(), so .flags is known to > be 0. Remove the useless | when assigning THERMAL_TRIP_FLAG_RW_TEMP. > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > This was added in commit cca52f696952 ("thermal: intel: Set > THERMAL_TRIP_FLAG_RW_TEMP directly") > --- > drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c > index 8dca6a6aceca..b43d848e66b8 100644 > --- a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c > +++ b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c > @@ -143,7 +143,7 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev, > for (i = 0; i < trip_cnt; i++) { > zone_trips[i].type = THERMAL_TRIP_PASSIVE; > zone_trips[i].temperature = THERMAL_TEMP_INVALID; > - zone_trips[i].flags |= THERMAL_TRIP_FLAG_RW_TEMP; > + zone_trips[i].flags = THERMAL_TRIP_FLAG_RW_TEMP; > zone_trips[i].priv = THERMAL_INT_TO_TRIP_PRIV(i); > } > > -- Applied as 6.15 material with edits in the subject and changelog, thanks!
diff --git a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c index 8dca6a6aceca..b43d848e66b8 100644 --- a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +++ b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c @@ -143,7 +143,7 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev, for (i = 0; i < trip_cnt; i++) { zone_trips[i].type = THERMAL_TRIP_PASSIVE; zone_trips[i].temperature = THERMAL_TEMP_INVALID; - zone_trips[i].flags |= THERMAL_TRIP_FLAG_RW_TEMP; + zone_trips[i].flags = THERMAL_TRIP_FLAG_RW_TEMP; zone_trips[i].priv = THERMAL_INT_TO_TRIP_PRIV(i); }
'zone_trips' has just been allocated with kzalloc(), so .flags is known to be 0. Remove the useless | when assigning THERMAL_TRIP_FLAG_RW_TEMP. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- This was added in commit cca52f696952 ("thermal: intel: Set THERMAL_TRIP_FLAG_RW_TEMP directly") --- drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)