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

Commit 1577ddfa authored by Zhang Rui's avatar Zhang Rui
Browse files

Merge branches 'thermal-intel' and 'thermal-core' into next

parents 70c50ee7 165989a5

drivers/thermal/clock_cooling.c

+1 −0
Original line number Diff line number Diff line
@@ -426,6 +426,7 @@ clock_cooling_register(struct device *dev, const char *clock_name) 
	if (!ccdev)

		return ERR_PTR(-ENOMEM);



	mutex_init(&ccdev->lock);

	ccdev->dev = dev;

	ccdev->clk = devm_clk_get(dev, clock_name);

	if (IS_ERR(ccdev->clk))

drivers/thermal/fair_share.c

+2 −0
Original line number Diff line number Diff line
@@ -116,7 +116,9 @@ static int fair_share_throttle(struct thermal_zone_device *tz, int trip) 
		instance->target = get_target_state(tz, cdev, percentage,

						    cur_trip_level);



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

		instance->cdev->updated = false;

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

		thermal_cdev_update(cdev);

	}

	return 0;

drivers/thermal/gov_bang_bang.c

+2 −0
Original line number Diff line number Diff line
@@ -71,7 +71,9 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip) 
		dev_dbg(&instance->cdev->device, "target=%d\n",

					(int)instance->target);



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

		instance->cdev->updated = false; /* cdev needs update */

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

	}



	mutex_unlock(&tz->lock);

drivers/thermal/power_allocator.c

+2 −0
Original line number Diff line number Diff line
@@ -529,7 +529,9 @@ static void allow_maximum_power(struct thermal_zone_device *tz) 
			continue;



		instance->target = 0;

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

		instance->cdev->updated = false;

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

		thermal_cdev_update(instance->cdev);

	}

}

drivers/thermal/step_wise.c

+2 −0
Original line number Diff line number Diff line
@@ -175,7 +175,9 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip) 
			update_passive_instance(tz, trip_type, -1);



		instance->initialized = true;

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

		instance->cdev->updated = false; /* cdev needs update */

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

	}



	mutex_unlock(&tz->lock);