| Message ID | 20230813025220.1752489-1-rui.zhang@intel.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | [V2] thermal: intel: intel_soc_dts_iosf: Remove redundant check | expand |
On Sun, Aug 13, 2023 at 4:52 AM Zhang Rui <rui.zhang@intel.com> wrote: > > Remove the redundant check in remove_dts_thermal_zone() because all of > its existing callers pass a valid pointer as the argument. > > Signed-off-by: Zhang Rui <rui.zhang@intel.com> > --- > drivers/thermal/intel/intel_soc_dts_iosf.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/thermal/intel/intel_soc_dts_iosf.c b/drivers/thermal/intel/intel_soc_dts_iosf.c > index db97499f4f0a..22fc2970c67d 100644 > --- a/drivers/thermal/intel/intel_soc_dts_iosf.c > +++ b/drivers/thermal/intel/intel_soc_dts_iosf.c > @@ -245,11 +245,9 @@ static int soc_dts_enable(int id) > > static void remove_dts_thermal_zone(struct intel_soc_dts_sensor_entry *dts) > { > - if (dts) { > - iosf_mbi_write(BT_MBI_UNIT_PMC, MBI_REG_WRITE, > - SOC_DTS_OFFSET_ENABLE, dts->store_status); > - thermal_zone_device_unregister(dts->tzone); > - } > + iosf_mbi_write(BT_MBI_UNIT_PMC, MBI_REG_WRITE, > + SOC_DTS_OFFSET_ENABLE, dts->store_status); > + thermal_zone_device_unregister(dts->tzone); > } > > static int add_dts_thermal_zone(int id, struct intel_soc_dts_sensor_entry *dts, > -- Applied as 6.6 material, thanks!
diff --git a/drivers/thermal/intel/intel_soc_dts_iosf.c b/drivers/thermal/intel/intel_soc_dts_iosf.c index db97499f4f0a..22fc2970c67d 100644 --- a/drivers/thermal/intel/intel_soc_dts_iosf.c +++ b/drivers/thermal/intel/intel_soc_dts_iosf.c @@ -245,11 +245,9 @@ static int soc_dts_enable(int id) static void remove_dts_thermal_zone(struct intel_soc_dts_sensor_entry *dts) { - if (dts) { - iosf_mbi_write(BT_MBI_UNIT_PMC, MBI_REG_WRITE, - SOC_DTS_OFFSET_ENABLE, dts->store_status); - thermal_zone_device_unregister(dts->tzone); - } + iosf_mbi_write(BT_MBI_UNIT_PMC, MBI_REG_WRITE, + SOC_DTS_OFFSET_ENABLE, dts->store_status); + thermal_zone_device_unregister(dts->tzone); } static int add_dts_thermal_zone(int id, struct intel_soc_dts_sensor_entry *dts,
Remove the redundant check in remove_dts_thermal_zone() because all of its existing callers pass a valid pointer as the argument. Signed-off-by: Zhang Rui <rui.zhang@intel.com> --- drivers/thermal/intel/intel_soc_dts_iosf.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)