From patchwork Wed Jul 25 02:11:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Rui" X-Patchwork-Id: 1234061 Return-Path: X-Original-To: patchwork-linux-pm@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 72C7C3FF1C for ; Wed, 25 Jul 2012 02:11:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756112Ab2GYCLx (ORCPT ); Tue, 24 Jul 2012 22:11:53 -0400 Received: from mga11.intel.com ([192.55.52.93]:36673 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755834Ab2GYCLw (ORCPT ); Tue, 24 Jul 2012 22:11:52 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 24 Jul 2012 19:11:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="197666461" Received: from rui-x220.sh.intel.com ([10.239.198.101]) by fmsmga002.fm.intel.com with ESMTP; 24 Jul 2012 19:11:48 -0700 From: Zhang Rui To: "Rafael J. Wysocki" , Matthew Garrett , Len Brown , R Durgadoss , Eduardo Valentin , Amit Kachhap , Wei Ni , Zhang Rui Cc: linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH RESEND 13/16] Thermal: List thermal_instance in thermal_cooling_device. Date: Wed, 25 Jul 2012 10:11:10 +0800 Message-Id: <1343182273-32096-14-git-send-email-rui.zhang@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343182273-32096-1-git-send-email-rui.zhang@intel.com> References: <1343182273-32096-1-git-send-email-rui.zhang@intel.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org List thermal_instance in thermal_cooling_device so that cooling device can know the cooling state requirement of all the thermal instances. Signed-off-by: Zhang Rui Reviewed-by: Rafael J. Wysocki --- drivers/thermal/thermal_sys.c | 7 ++++++- include/linux/thermal.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c index b76e55f..0a06ea4 100644 --- a/drivers/thermal/thermal_sys.c +++ b/drivers/thermal/thermal_sys.c @@ -57,6 +57,7 @@ struct thermal_instance { char attr_name[THERMAL_NAME_LENGTH]; struct device_attribute attr; struct list_head tz_node; /* node in tz->thermal_instances */ + struct list_head cdev_node; /* node in cdev->thermal_instances */ }; static DEFINE_IDR(thermal_tz_idr); @@ -882,8 +883,10 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, result = -EEXIST; break; } - if (!result) + if (!result) { list_add_tail(&dev->tz_node, &tz->thermal_instances); + list_add_tail(&dev->cdev_node, &cdev->thermal_instances); + } mutex_unlock(&tz->lock); if (!result) @@ -919,6 +922,7 @@ int thermal_zone_unbind_cooling_device(struct thermal_zone_device *tz, list_for_each_entry_safe(pos, next, &tz->thermal_instances, tz_node) { if (pos->tz == tz && pos->trip == trip && pos->cdev == cdev) { list_del(&pos->tz_node); + list_del(&pos->cdev_node); mutex_unlock(&tz->lock); goto unbind; } @@ -988,6 +992,7 @@ thermal_cooling_device_register(char *type, void *devdata, } strcpy(cdev->type, type); + INIT_LIST_HEAD(&cdev->thermal_instances); cdev->ops = ops; cdev->device.class = &thermal_class; cdev->devdata = devdata; diff --git a/include/linux/thermal.h b/include/linux/thermal.h index b11db1e..bcf3384 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -94,6 +94,7 @@ struct thermal_cooling_device { struct device device; void *devdata; const struct thermal_cooling_device_ops *ops; + struct list_head thermal_instances; struct list_head node; };