diff options
| -rw-r--r-- | drivers/thermal/thermal_core.c | 2 | ||||
| -rw-r--r-- | drivers/thermal/thermal_core.h | 1 | ||||
| -rw-r--r-- | drivers/thermal/thermal_helpers.c | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 8c52746c5eba..4187f207bce9 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -804,7 +804,7 @@ static int thermal_bind_cdev_to_trip(struct thermal_zone_device *tz, dev = kzalloc(sizeof(*dev), GFP_KERNEL); if (!dev) return -ENOMEM; - dev->tz = tz; + dev->cdev = cdev; dev->trip = trip; dev->upper = cool_spec->upper; diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h index c983e7ff6ed0..9b19b614a1bc 100644 --- a/drivers/thermal/thermal_core.h +++ b/drivers/thermal/thermal_core.h @@ -213,7 +213,6 @@ int get_tz_trend(struct thermal_zone_device *tz, const struct thermal_trip *trip struct thermal_instance { int id; char name[THERMAL_NAME_LENGTH]; - struct thermal_zone_device *tz; struct thermal_cooling_device *cdev; const struct thermal_trip *trip; bool initialized; diff --git a/drivers/thermal/thermal_helpers.c b/drivers/thermal/thermal_helpers.c index be477b153add..dc374a7a1a65 100644 --- a/drivers/thermal/thermal_helpers.c +++ b/drivers/thermal/thermal_helpers.c @@ -181,8 +181,6 @@ void __thermal_cdev_update(struct thermal_cooling_device *cdev) /* Make sure cdev enters the deepest cooling state */ list_for_each_entry(instance, &cdev->thermal_instances, cdev_node) { - dev_dbg(&cdev->device, "zone%d->target=%lu\n", - instance->tz->id, instance->target); if (instance->target == THERMAL_NO_TARGET) continue; if (instance->target > target) |