Merge tag 'nfs-for-5.10-1' of git://git.linux-nfs.org/projects/anna/linux-nfs

[linux-2.6-microblaze.git] / drivers / thermal / thermal_core.c

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index a6616e5..c6d74bc 100644 (file)
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -603,7 +603,6 @@ static void thermal_zone_device_check(struct work_struct *work)
 /**
  * power_actor_get_max_power() - get the maximum power that a cdev can consume
  * @cdev:      pointer to &thermal_cooling_device
- * @tz:                a valid thermal zone device pointer
  * @max_power: pointer in which to store the maximum power
  *
  * Calculate the maximum power consumption in milliwats that the
@@ -613,18 +612,17 @@ static void thermal_zone_device_check(struct work_struct *work)
  * power_actor API or -E* on other error.
  */
 int power_actor_get_max_power(struct thermal_cooling_device *cdev,
-                             struct thermal_zone_device *tz, u32 *max_power)
+                             u32 *max_power)
 {
        if (!cdev_is_power_actor(cdev))
                return -EINVAL;
 
-       return cdev->ops->state2power(cdev, tz, 0, max_power);
+       return cdev->ops->state2power(cdev, 0, max_power);
 }
 
 /**
  * power_actor_get_min_power() - get the mainimum power that a cdev can consume
  * @cdev:      pointer to &thermal_cooling_device
- * @tz:                a valid thermal zone device pointer
  * @min_power: pointer in which to store the minimum power
  *
  * Calculate the minimum power consumption in milliwatts that the
@@ -634,7 +632,7 @@ int power_actor_get_max_power(struct thermal_cooling_device *cdev,
  * power_actor API or -E* on other error.
  */
 int power_actor_get_min_power(struct thermal_cooling_device *cdev,
-                             struct thermal_zone_device *tz, u32 *min_power)
+                             u32 *min_power)
 {
        unsigned long max_state;
        int ret;
@@ -646,7 +644,7 @@ int power_actor_get_min_power(struct thermal_cooling_device *cdev,
        if (ret)
                return ret;
 
-       return cdev->ops->state2power(cdev, tz, max_state, min_power);
+       return cdev->ops->state2power(cdev, max_state, min_power);
 }
 
 /**
@@ -670,7 +668,7 @@ int power_actor_set_power(struct thermal_cooling_device *cdev,
        if (!cdev_is_power_actor(cdev))
                return -EINVAL;
 
-       ret = cdev->ops->power2state(cdev, instance->tz, power, &state);
+       ret = cdev->ops->power2state(cdev, power, &state);
        if (ret)
                return ret;
 
@@ -1652,7 +1650,6 @@ static int __init thermal_init(void)
        if (result)
                goto error;
 
-       mutex_init(&poweroff_lock);
        result = thermal_register_governors();
        if (result)
                goto error;