From patchwork Thu Jul 19 06:31:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Rui" X-Patchwork-Id: 1215461 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 8F9773FD4F for ; Thu, 19 Jul 2012 06:32:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752823Ab2GSGcB (ORCPT ); Thu, 19 Jul 2012 02:32:01 -0400 Received: from mga14.intel.com ([143.182.124.37]:61928 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752795Ab2GSGb7 (ORCPT ); Thu, 19 Jul 2012 02:31:59 -0400 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 18 Jul 2012 23:31:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="170231237" Received: from rui-x220.sh.intel.com ([10.239.197.100]) by azsmga001.ch.intel.com with ESMTP; 18 Jul 2012 23:31:56 -0700 From: Zhang Rui To: linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org Cc: "Rafael J. Wysocki" , Matthew Garrett , Len Brown , R Durgadoss , Eduardo Valentin , Amit Kachhap , Wei Ni , Zhang Rui Subject: [PATCH 11/16] Thermal: Rename thermal_zone_device.cooling_devices to thermal_zone_device.instances Date: Thu, 19 Jul 2012 14:31:15 +0800 Message-Id: <1342679480-5336-12-git-send-email-rui.zhang@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1342679480-5336-1-git-send-email-rui.zhang@intel.com> References: <1342679480-5336-1-git-send-email-rui.zhang@intel.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org thermal_zone_device.cooling_devices is not accurate as this is a list for thermal instances, rather than cooling devices. Signed-off-by: Zhang Rui --- drivers/thermal/thermal_sys.c | 18 +++++++++--------- include/linux/thermal.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c index 867fced..1836039 100644 --- a/drivers/thermal/thermal_sys.c +++ b/drivers/thermal/thermal_sys.c @@ -745,7 +745,7 @@ static void thermal_zone_device_passive(struct thermal_zone_device *tz, /* Heating up? */ if (trend > 0) { - list_for_each_entry(instance, &tz->cooling_devices, + list_for_each_entry(instance, &tz->instances, node) { if (instance->trip != trip) continue; @@ -756,7 +756,7 @@ static void thermal_zone_device_passive(struct thermal_zone_device *tz, cdev->ops->set_cur_state(cdev, state); } } else if (trend < 0) { /* Cooling off? */ - list_for_each_entry(instance, &tz->cooling_devices, + list_for_each_entry(instance, &tz->instances, node) { if (instance->trip != trip) continue; @@ -777,7 +777,7 @@ static void thermal_zone_device_passive(struct thermal_zone_device *tz, * and avoid thrashing around the passive trip point. Note that we * assume symmetry. */ - list_for_each_entry(instance, &tz->cooling_devices, node) { + list_for_each_entry(instance, &tz->instances, node) { if (instance->trip != trip) continue; cdev = instance->cdev; @@ -873,13 +873,13 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, goto remove_symbol_link; mutex_lock(&tz->lock); - list_for_each_entry(pos, &tz->cooling_devices, node) + list_for_each_entry(pos, &tz->instances, node) if (pos->tz == tz && pos->trip == trip && pos->cdev == cdev) { result = -EEXIST; break; } if (!result) - list_add_tail(&dev->node, &tz->cooling_devices); + list_add_tail(&dev->node, &tz->instances); mutex_unlock(&tz->lock); if (!result) @@ -912,7 +912,7 @@ int thermal_zone_unbind_cooling_device(struct thermal_zone_device *tz, struct thermal_instance *pos, *next; mutex_lock(&tz->lock); - list_for_each_entry_safe(pos, next, &tz->cooling_devices, node) { + list_for_each_entry_safe(pos, next, &tz->instances, node) { if (pos->tz == tz && pos->trip == trip && pos->cdev == cdev) { list_del(&pos->node); mutex_unlock(&tz->lock); @@ -1106,7 +1106,7 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, if (temp >= trip_temp) { thermal_get_trend(tz, trip, &trend); - list_for_each_entry(instance, &tz->cooling_devices, node) { + list_for_each_entry(instance, &tz->instances, node) { if (instance->trip != trip) continue; @@ -1125,7 +1125,7 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, cdev->ops->set_cur_state(cdev, cur_state); } } else { /* below trip */ - list_for_each_entry(instance, &tz->cooling_devices, node) { + list_for_each_entry(instance, &tz->instances, node) { if (instance->trip != trip) continue; @@ -1359,7 +1359,7 @@ struct thermal_zone_device *thermal_zone_device_register(char *type, if (!tz) return ERR_PTR(-ENOMEM); - INIT_LIST_HEAD(&tz->cooling_devices); + INIT_LIST_HEAD(&tz->instances); idr_init(&tz->idr); mutex_init(&tz->lock); result = get_idr(&thermal_tz_idr, &thermal_idr_lock, &tz->id); diff --git a/include/linux/thermal.h b/include/linux/thermal.h index 44d7fc3..a15b83c 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -120,9 +120,9 @@ struct thermal_zone_device { bool passive; unsigned int forced_passive; const struct thermal_zone_device_ops *ops; - struct list_head cooling_devices; + struct list_head instances; struct idr idr; - struct mutex lock; /* protect cooling devices list */ + struct mutex lock; /* protect instances list */ struct list_head node; struct delayed_work poll_queue; };