Commit d0812286 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge updates of thermal drivers for Intel platforms for 6.6-rc1. 

These remove a redundant check from a driver's "remove" routine
and use module_platform_driver() to replace an open-coded version
of it in one driver.

* thermal-intel:
  thermal: intel: intel_soc_dts_iosf: Remove redundant check
  thermal: intel: int340x: simplify the code with module_platform_driver()
parents f96801f0 ee188ee6

drivers/thermal/intel/int340x_thermal/int3401_thermal.c

+1 −12
Original line number Diff line number Diff line
@@ -70,18 +70,7 @@ static struct platform_driver int3401_driver = { 
	},

};



static int __init proc_thermal_init(void)

{

	return platform_driver_register(&int3401_driver);

}



static void __exit proc_thermal_exit(void)

{

	platform_driver_unregister(&int3401_driver);

}



module_init(proc_thermal_init);

module_exit(proc_thermal_exit);

module_platform_driver(int3401_driver);



MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>");

MODULE_DESCRIPTION("Processor Thermal Reporting Device Driver");

drivers/thermal/intel/intel_soc_dts_iosf.c

+3 −5
Original line number Diff line number Diff line
@@ -212,12 +212,10 @@ 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);

}

}



static int add_dts_thermal_zone(int id, struct intel_soc_dts_sensor_entry *dts,

				bool critical_trip)