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

thermal: gov_bang_bang: Fold thermal_zone_trip_update() into its caller 



Fold thermal_zone_trip_update() into bang_bang_control() which is the
only caller of it to reduce code size and make it easier to follow.

No functional impact.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarLukasz Luba <lukasz.luba@arm.com>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 4526c581

drivers/thermal/gov_bang_bang.c

+33 −42
Original line number Diff line number Diff line
@@ -13,12 +13,42 @@ 


#include "thermal_core.h"



static void thermal_zone_trip_update(struct thermal_zone_device *tz,

/**

 * bang_bang_control - controls devices associated with the given zone

 * @tz: thermal_zone_device

 * @trip: the trip point

 * @crossed_up: whether or not the trip has been crossed on the way up

 *

 * Regulation Logic: a two point regulation, deliver cooling state depending

 * on the previous state shown in this diagram:

 *

 *                Fan:   OFF    ON

 *

 *                              |

 *                              |

 *          trip_temp:    +---->+

 *                        |     |        ^

 *                        |     |        |

 *                        |     |   Temperature

 * (trip_temp - hyst):    +<----+

 *                        |

 *                        |

 *                        |

 *

 *   * If the fan is not running and temperature exceeds trip_temp, the fan

 *     gets turned on.

 *   * In case the fan is running, temperature must fall below

 *     (trip_temp - hyst) so that the fan gets turned off again.

 *

 */

static void bang_bang_control(struct thermal_zone_device *tz,

			      const struct thermal_trip *trip,

			      bool crossed_up)

{

	struct thermal_instance *instance;



	lockdep_assert_held(&tz->lock);



	dev_dbg(&tz->device, "Trip%d[temp=%d]:temp=%d:hyst=%d\n",

		thermal_zone_trip_id(tz, trip), trip->temperature,

		tz->temperature, trip->hysteresis);
@@ -52,45 +82,6 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, 
		instance->cdev->updated = false; /* cdev needs update */

		mutex_unlock(&instance->cdev->lock);

	}

}



/**

 * bang_bang_control - controls devices associated with the given zone

 * @tz: thermal_zone_device

 * @trip: the trip point

 * @crossed_up: whether or not the trip has been crossed on the way up

 *

 * Regulation Logic: a two point regulation, deliver cooling state depending

 * on the previous state shown in this diagram:

 *

 *                Fan:   OFF    ON

 *

 *                              |

 *                              |

 *          trip_temp:    +---->+

 *                        |     |        ^

 *                        |     |        |

 *                        |     |   Temperature

 * (trip_temp - hyst):    +<----+

 *                        |

 *                        |

 *                        |

 *

 *   * If the fan is not running and temperature exceeds trip_temp, the fan

 *     gets turned on.

 *   * In case the fan is running, temperature must fall below

 *     (trip_temp - hyst) so that the fan gets turned off again.

 *

 */

static void bang_bang_control(struct thermal_zone_device *tz,

			      const struct thermal_trip *trip,

			      bool crossed_up)

{

	struct thermal_instance *instance;



	lockdep_assert_held(&tz->lock);



	thermal_zone_trip_update(tz, trip, crossed_up);



	list_for_each_entry(instance, &tz->thermal_instances, tz_node)

		thermal_cdev_update(instance->cdev);