Thermal: Pass zone parameters as argument to tzd_register
This patch adds the thermal zone parameter as an argument to the tzd_register() function call; and updates other drivers using this function. Signed-off-by: Durgadoss R <durgadoss.r@intel.com> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
This commit is contained in:
parent
ef87394791
commit
50125a9b27
|
@ -900,14 +900,14 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
|
||||||
if (tz->trips.passive.flags.valid)
|
if (tz->trips.passive.flags.valid)
|
||||||
tz->thermal_zone =
|
tz->thermal_zone =
|
||||||
thermal_zone_device_register("acpitz", trips, 0, tz,
|
thermal_zone_device_register("acpitz", trips, 0, tz,
|
||||||
&acpi_thermal_zone_ops,
|
&acpi_thermal_zone_ops, NULL,
|
||||||
tz->trips.passive.tsp*100,
|
tz->trips.passive.tsp*100,
|
||||||
tz->polling_frequency*100);
|
tz->polling_frequency*100);
|
||||||
else
|
else
|
||||||
tz->thermal_zone =
|
tz->thermal_zone =
|
||||||
thermal_zone_device_register("acpitz", trips, 0, tz,
|
thermal_zone_device_register("acpitz", trips, 0, tz,
|
||||||
&acpi_thermal_zone_ops, 0,
|
&acpi_thermal_zone_ops, NULL,
|
||||||
tz->polling_frequency*100);
|
0, tz->polling_frequency*100);
|
||||||
if (IS_ERR(tz->thermal_zone))
|
if (IS_ERR(tz->thermal_zone))
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
|
|
|
@ -662,7 +662,7 @@ static int acerhdf_register_thermal(void)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
thz_dev = thermal_zone_device_register("acerhdf", 1, 0, NULL,
|
thz_dev = thermal_zone_device_register("acerhdf", 1, 0, NULL,
|
||||||
&acerhdf_dev_ops, 0,
|
&acerhdf_dev_ops, NULL, 0,
|
||||||
(kernelmode) ? interval*1000 : 0);
|
(kernelmode) ? interval*1000 : 0);
|
||||||
if (IS_ERR(thz_dev))
|
if (IS_ERR(thz_dev))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
|
@ -502,7 +502,7 @@ static int mid_thermal_probe(struct platform_device *pdev)
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
pinfo->tzd[i] = thermal_zone_device_register(name[i],
|
pinfo->tzd[i] = thermal_zone_device_register(name[i],
|
||||||
0, 0, td_info, &tzd_ops, 0, 0);
|
0, 0, td_info, &tzd_ops, NULL, 0, 0);
|
||||||
if (IS_ERR(pinfo->tzd[i])) {
|
if (IS_ERR(pinfo->tzd[i])) {
|
||||||
kfree(td_info);
|
kfree(td_info);
|
||||||
ret = PTR_ERR(pinfo->tzd[i]);
|
ret = PTR_ERR(pinfo->tzd[i]);
|
||||||
|
|
|
@ -201,7 +201,7 @@ static int psy_register_thermal(struct power_supply *psy)
|
||||||
for (i = 0; i < psy->num_properties; i++) {
|
for (i = 0; i < psy->num_properties; i++) {
|
||||||
if (psy->properties[i] == POWER_SUPPLY_PROP_TEMP) {
|
if (psy->properties[i] == POWER_SUPPLY_PROP_TEMP) {
|
||||||
psy->tzd = thermal_zone_device_register(psy->name, 0, 0,
|
psy->tzd = thermal_zone_device_register(psy->name, 0, 0,
|
||||||
psy, &psy_tzd_ops, 0, 0);
|
psy, &psy_tzd_ops, NULL, 0, 0);
|
||||||
if (IS_ERR(psy->tzd))
|
if (IS_ERR(psy->tzd))
|
||||||
return PTR_ERR(psy->tzd);
|
return PTR_ERR(psy->tzd);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -270,7 +270,7 @@ int omap_thermal_expose_sensor(struct omap_bandgap *bg_ptr, int id,
|
||||||
/* Create thermal zone */
|
/* Create thermal zone */
|
||||||
data->omap_thermal = thermal_zone_device_register(domain,
|
data->omap_thermal = thermal_zone_device_register(domain,
|
||||||
OMAP_TRIP_NUMBER, 0, data, &omap_thermal_ops,
|
OMAP_TRIP_NUMBER, 0, data, &omap_thermal_ops,
|
||||||
FAST_TEMP_MONITORING_RATE,
|
NULL, FAST_TEMP_MONITORING_RATE,
|
||||||
FAST_TEMP_MONITORING_RATE);
|
FAST_TEMP_MONITORING_RATE);
|
||||||
if (IS_ERR_OR_NULL(data->omap_thermal)) {
|
if (IS_ERR_OR_NULL(data->omap_thermal)) {
|
||||||
dev_err(bg_ptr->dev, "thermal zone device is NULL\n");
|
dev_err(bg_ptr->dev, "thermal zone device is NULL\n");
|
||||||
|
|
|
@ -451,7 +451,7 @@ static int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf)
|
||||||
th_zone->cool_dev_size++;
|
th_zone->cool_dev_size++;
|
||||||
|
|
||||||
th_zone->therm_dev = thermal_zone_device_register(sensor_conf->name,
|
th_zone->therm_dev = thermal_zone_device_register(sensor_conf->name,
|
||||||
EXYNOS_ZONE_COUNT, 0, NULL, &exynos_dev_ops, 0,
|
EXYNOS_ZONE_COUNT, 0, NULL, &exynos_dev_ops, NULL, 0,
|
||||||
IDLE_INTERVAL);
|
IDLE_INTERVAL);
|
||||||
|
|
||||||
if (IS_ERR(th_zone->therm_dev)) {
|
if (IS_ERR(th_zone->therm_dev)) {
|
||||||
|
|
|
@ -211,7 +211,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
|
||||||
}
|
}
|
||||||
|
|
||||||
zone = thermal_zone_device_register("rcar_thermal", 0, 0, priv,
|
zone = thermal_zone_device_register("rcar_thermal", 0, 0, priv,
|
||||||
&rcar_thermal_zone_ops, 0, 0);
|
&rcar_thermal_zone_ops, NULL, 0, 0);
|
||||||
if (IS_ERR(zone)) {
|
if (IS_ERR(zone)) {
|
||||||
dev_err(&pdev->dev, "thermal zone device is NULL\n");
|
dev_err(&pdev->dev, "thermal zone device is NULL\n");
|
||||||
ret = PTR_ERR(zone);
|
ret = PTR_ERR(zone);
|
||||||
|
|
|
@ -147,7 +147,7 @@ static int spear_thermal_probe(struct platform_device *pdev)
|
||||||
writel_relaxed(stdev->flags, stdev->thermal_base);
|
writel_relaxed(stdev->flags, stdev->thermal_base);
|
||||||
|
|
||||||
spear_thermal = thermal_zone_device_register("spear_thermal", 0, 0,
|
spear_thermal = thermal_zone_device_register("spear_thermal", 0, 0,
|
||||||
stdev, &ops, 0, 0);
|
stdev, &ops, NULL, 0, 0);
|
||||||
if (IS_ERR(spear_thermal)) {
|
if (IS_ERR(spear_thermal)) {
|
||||||
dev_err(&pdev->dev, "thermal zone device is NULL\n");
|
dev_err(&pdev->dev, "thermal zone device is NULL\n");
|
||||||
ret = PTR_ERR(spear_thermal);
|
ret = PTR_ERR(spear_thermal);
|
||||||
|
|
|
@ -1341,6 +1341,7 @@ static void remove_trip_attrs(struct thermal_zone_device *tz)
|
||||||
* @mask: a bit string indicating the writeablility of trip points
|
* @mask: a bit string indicating the writeablility of trip points
|
||||||
* @devdata: private device data
|
* @devdata: private device data
|
||||||
* @ops: standard thermal zone device callbacks
|
* @ops: standard thermal zone device callbacks
|
||||||
|
* @tzp: thermal zone platform parameters
|
||||||
* @passive_delay: number of milliseconds to wait between polls when
|
* @passive_delay: number of milliseconds to wait between polls when
|
||||||
* performing passive cooling
|
* performing passive cooling
|
||||||
* @polling_delay: number of milliseconds to wait between polls when checking
|
* @polling_delay: number of milliseconds to wait between polls when checking
|
||||||
|
@ -1353,6 +1354,7 @@ static void remove_trip_attrs(struct thermal_zone_device *tz)
|
||||||
struct thermal_zone_device *thermal_zone_device_register(const char *type,
|
struct thermal_zone_device *thermal_zone_device_register(const char *type,
|
||||||
int trips, int mask, void *devdata,
|
int trips, int mask, void *devdata,
|
||||||
const struct thermal_zone_device_ops *ops,
|
const struct thermal_zone_device_ops *ops,
|
||||||
|
const struct thermal_zone_params *tzp,
|
||||||
int passive_delay, int polling_delay)
|
int passive_delay, int polling_delay)
|
||||||
{
|
{
|
||||||
struct thermal_zone_device *tz;
|
struct thermal_zone_device *tz;
|
||||||
|
@ -1386,6 +1388,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
|
||||||
|
|
||||||
strcpy(tz->type, type ? : "");
|
strcpy(tz->type, type ? : "");
|
||||||
tz->ops = ops;
|
tz->ops = ops;
|
||||||
|
tz->tzp = tzp;
|
||||||
tz->device.class = &thermal_class;
|
tz->device.class = &thermal_class;
|
||||||
tz->devdata = devdata;
|
tz->devdata = devdata;
|
||||||
tz->trips = trips;
|
tz->trips = trips;
|
||||||
|
|
|
@ -200,7 +200,8 @@ struct thermal_genl_event {
|
||||||
|
|
||||||
/* Function declarations */
|
/* Function declarations */
|
||||||
struct thermal_zone_device *thermal_zone_device_register(const char *, int, int,
|
struct thermal_zone_device *thermal_zone_device_register(const char *, int, int,
|
||||||
void *, const struct thermal_zone_device_ops *, int, int);
|
void *, const struct thermal_zone_device_ops *,
|
||||||
|
const struct thermal_zone_params *, int, int);
|
||||||
void thermal_zone_device_unregister(struct thermal_zone_device *);
|
void thermal_zone_device_unregister(struct thermal_zone_device *);
|
||||||
|
|
||||||
int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int,
|
int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int,
|
||||||
|
|
Reference in New Issue