Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b263b473 authored by Keerthy's avatar Keerthy Committed by Eduardo Valentin
Browse files

thermal: ti-soc-thermal: Remove redundant code 



ti_thermal_expose_sensor always takes the
devm_thermal_zone_of_sensor_register call for registration
with the device tree nodes present for all the bandgap sensors
for omap3/4/5 and dra7 family. There are large chunks of unused
code. Removing all of them.

Signed-off-by: default avatarKeerthy <j-keerthy@ti.com>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent 004f7728

drivers/thermal/ti-soc-thermal/ti-thermal-common.c

+3 −151
Original line number Diff line number Diff line
@@ -126,119 +126,6 @@ static inline int ti_thermal_get_temp(struct thermal_zone_device *thermal, 
	return __ti_thermal_get_temp(data, temp);

}



/* Bind callback functions for thermal zone */

static int ti_thermal_bind(struct thermal_zone_device *thermal,

			   struct thermal_cooling_device *cdev)

{

	struct ti_thermal_data *data = thermal->devdata;

	int id;



	if (!data || IS_ERR(data))

		return -ENODEV;



	/* check if this is the cooling device we registered */

	if (data->cool_dev != cdev)

		return 0;



	id = data->sensor_id;



	/* Simple thing, two trips, one passive another critical */

	return thermal_zone_bind_cooling_device(thermal, 0, cdev,

	/* bind with min and max states defined by cpu_cooling */

						THERMAL_NO_LIMIT,

						THERMAL_NO_LIMIT,

						THERMAL_WEIGHT_DEFAULT);

}



/* Unbind callback functions for thermal zone */

static int ti_thermal_unbind(struct thermal_zone_device *thermal,

			     struct thermal_cooling_device *cdev)

{

	struct ti_thermal_data *data = thermal->devdata;



	if (!data || IS_ERR(data))

		return -ENODEV;



	/* check if this is the cooling device we registered */

	if (data->cool_dev != cdev)

		return 0;



	/* Simple thing, two trips, one passive another critical */

	return thermal_zone_unbind_cooling_device(thermal, 0, cdev);

}



/* Get mode callback functions for thermal zone */

static int ti_thermal_get_mode(struct thermal_zone_device *thermal,

			       enum thermal_device_mode *mode)

{

	struct ti_thermal_data *data = thermal->devdata;



	if (data)

		*mode = data->mode;



	return 0;

}



/* Set mode callback functions for thermal zone */

static int ti_thermal_set_mode(struct thermal_zone_device *thermal,

			       enum thermal_device_mode mode)

{

	struct ti_thermal_data *data = thermal->devdata;

	struct ti_bandgap *bgp;



	bgp = data->bgp;



	if (!data->ti_thermal) {

		dev_notice(&thermal->device, "thermal zone not registered\n");

		return 0;

	}



	mutex_lock(&data->ti_thermal->lock);



	if (mode == THERMAL_DEVICE_ENABLED)

		data->ti_thermal->polling_delay = FAST_TEMP_MONITORING_RATE;

	else

		data->ti_thermal->polling_delay = 0;



	mutex_unlock(&data->ti_thermal->lock);



	data->mode = mode;

	ti_bandgap_write_update_interval(bgp, data->sensor_id,

					data->ti_thermal->polling_delay);

	thermal_zone_device_update(data->ti_thermal, THERMAL_EVENT_UNSPECIFIED);

	dev_dbg(&thermal->device, "thermal polling set for duration=%d msec\n",

		data->ti_thermal->polling_delay);



	return 0;

}



/* Get trip type callback functions for thermal zone */

static int ti_thermal_get_trip_type(struct thermal_zone_device *thermal,

				    int trip, enum thermal_trip_type *type)

{

	if (!ti_thermal_is_valid_trip(trip))

		return -EINVAL;



	if (trip + 1 == OMAP_TRIP_NUMBER)

		*type = THERMAL_TRIP_CRITICAL;

	else

		*type = THERMAL_TRIP_PASSIVE;



	return 0;

}



/* Get trip temperature callback functions for thermal zone */

static int ti_thermal_get_trip_temp(struct thermal_zone_device *thermal,

				    int trip, int *temp)

{

	if (!ti_thermal_is_valid_trip(trip))

		return -EINVAL;



	*temp = ti_thermal_get_trip_value(trip);



	return 0;

}



static int __ti_thermal_get_trend(void *p, int trip, enum thermal_trend *trend)

{

	struct ti_thermal_data *data = p;
@@ -262,38 +149,11 @@ static int __ti_thermal_get_trend(void *p, int trip, enum thermal_trend *trend) 
	return 0;

}



/* Get the temperature trend callback functions for thermal zone */

static int ti_thermal_get_trend(struct thermal_zone_device *thermal,

				int trip, enum thermal_trend *trend)

{

	return __ti_thermal_get_trend(thermal->devdata, trip, trend);

}



/* Get critical temperature callback functions for thermal zone */

static int ti_thermal_get_crit_temp(struct thermal_zone_device *thermal,

				    int *temp)

{

	/* shutdown zone */

	return ti_thermal_get_trip_temp(thermal, OMAP_TRIP_NUMBER - 1, temp);

}



static const struct thermal_zone_of_device_ops ti_of_thermal_ops = {

	.get_temp = __ti_thermal_get_temp,

	.get_trend = __ti_thermal_get_trend,

};



static struct thermal_zone_device_ops ti_thermal_ops = {

	.get_temp = ti_thermal_get_temp,

	.get_trend = ti_thermal_get_trend,

	.bind = ti_thermal_bind,

	.unbind = ti_thermal_unbind,

	.get_mode = ti_thermal_get_mode,

	.set_mode = ti_thermal_set_mode,

	.get_trip_type = ti_thermal_get_trip_type,

	.get_trip_temp = ti_thermal_get_trip_temp,

	.get_crit_temp = ti_thermal_get_crit_temp,

};



static struct ti_thermal_data

*ti_thermal_build_data(struct ti_bandgap *bgp, int id)

{
@@ -330,19 +190,11 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id, 
	/* in case this is specified by DT */

	data->ti_thermal = devm_thermal_zone_of_sensor_register(bgp->dev, id,

					data, &ti_of_thermal_ops);

	if (IS_ERR(data->ti_thermal)) {

		/* Create thermal zone */

		data->ti_thermal = thermal_zone_device_register(domain,

				OMAP_TRIP_NUMBER, 0, data, &ti_thermal_ops,

				NULL, FAST_TEMP_MONITORING_RATE,

				FAST_TEMP_MONITORING_RATE);

	if (IS_ERR(data->ti_thermal)) {

		dev_err(bgp->dev, "thermal zone device is NULL\n");

		return PTR_ERR(data->ti_thermal);

	}

		data->ti_thermal->polling_delay = FAST_TEMP_MONITORING_RATE;

		data->our_zone = true;

	}



	ti_bandgap_set_sensor_data(bgp, id, data);

	ti_bandgap_write_update_interval(bgp, data->sensor_id,

					data->ti_thermal->polling_delay);