From: Durgadoss R <durgadoss.r@intel.com>
To: lenb@kernel.org, rui.zhang@intel.com
Cc: linux-acpi@vger.kernel.org, eduardo.valentin@ti.com,
Durgadoss R <durgadoss.r@intel.com>
Subject: [PATCHv3 02/15] Thermal: Move thermal_instance to thermal_core.h
Date: Sat, 1 Sep 2012 17:21:23 +0530 [thread overview]
Message-ID: <1346500296-25200-3-git-send-email-durgadoss.r@intel.com> (raw)
In-Reply-To: <1346500296-25200-1-git-send-email-durgadoss.r@intel.com>
This patch creates a thermal_core.h file which can contain
all defines used by the core thermal framework files. For
now, move the thermal_instance structure to thermal_core.h
This structure is used by files under drivers/thermal/.
Signed-off-by: Durgadoss R <durgadoss.r@intel.com>
---
drivers/thermal/thermal_core.h | 53 ++++++++++++++++++++++++++++++++++++++++
drivers/thermal/thermal_sys.c | 23 ++---------------
2 files changed, 55 insertions(+), 21 deletions(-)
create mode 100644 drivers/thermal/thermal_core.h
diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h
new file mode 100644
index 0000000..0d3205a
--- /dev/null
+++ b/drivers/thermal/thermal_core.h
@@ -0,0 +1,53 @@
+/*
+ * thermal_core.h
+ *
+ * Copyright (C) 2012 Intel Corp
+ * Author: Durgadoss R <durgadoss.r@intel.com>
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+
+#ifndef __THERMAL_CORE_H__
+#define __THERMAL_CORE_H__
+
+#include <linux/device.h>
+#include <linux/thermal.h>
+
+/* Initial state of a cooling device during binding */
+#define THERMAL_NO_TARGET -1UL
+
+/*
+ * This structure is used to describe the behavior of
+ * a certain cooling device on a certain trip point
+ * in a certain thermal zone
+ */
+struct thermal_instance {
+ int id;
+ char name[THERMAL_NAME_LENGTH];
+ struct thermal_zone_device *tz;
+ struct thermal_cooling_device *cdev;
+ int trip;
+ unsigned long upper; /* Highest cooling state for this trip point */
+ unsigned long lower; /* Lowest cooling state for this trip point */
+ unsigned long target; /* expected cooling state */
+ 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 */
+};
+
+#endif /* __THERMAL_CORE_H__ */
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 5be8728..0e71b00 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -37,31 +37,12 @@
#include <net/netlink.h>
#include <net/genetlink.h>
+#include "thermal_core.h"
+
MODULE_AUTHOR("Zhang Rui");
MODULE_DESCRIPTION("Generic thermal management sysfs support");
MODULE_LICENSE("GPL");
-#define THERMAL_NO_TARGET -1UL
-/*
- * This structure is used to describe the behavior of
- * a certain cooling device on a certain trip point
- * in a certain thermal zone
- */
-struct thermal_instance {
- int id;
- char name[THERMAL_NAME_LENGTH];
- struct thermal_zone_device *tz;
- struct thermal_cooling_device *cdev;
- int trip;
- unsigned long upper; /* Highest cooling state for this trip point */
- unsigned long lower; /* Lowest cooling state for this trip point */
- unsigned long target; /* expected cooling state */
- 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);
static DEFINE_IDR(thermal_cdev_idr);
static DEFINE_MUTEX(thermal_idr_lock);
--
1.7.9.5
next prev parent reply other threads:[~2012-09-01 11:52 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-01 11:51 [PATCHv3 00/15] Thermal_Framework_Enhancements Durgadoss R
2012-09-01 11:51 ` [PATCHv3 01/15] Thermal: Refactor thermal.h file Durgadoss R
2012-09-01 11:51 ` Durgadoss R [this message]
2012-09-01 11:51 ` [PATCHv3 03/15] Thermal: Add get trend, get instance API's to thermal_sys Durgadoss R
2012-09-01 11:51 ` [PATCHv3 04/15] Thermal: Add platform level information to thermal.h Durgadoss R
2012-09-01 11:51 ` [PATCHv3 05/15] Thermal: Pass zone parameters as argument to tzd_register Durgadoss R
2012-09-01 11:51 ` [PATCHv3 06/15] Thermal: Add thermal governor registration APIs Durgadoss R
2012-09-10 8:28 ` Zhang Rui
2012-09-01 11:51 ` [PATCHv3 07/15] Thermal: Add a policy sysfs attribute Durgadoss R
2012-09-01 11:51 ` [PATCHv3 08/15] Thermal: Update binding logic based on platform data Durgadoss R
2012-09-01 11:51 ` [PATCHv3 09/15] Thermal: Make thermal_cdev_update as a global function Durgadoss R
2012-09-01 11:51 ` [PATCHv3 10/15] Thermal: Introduce fair_share thermal governor Durgadoss R
2012-09-01 11:51 ` [PATCHv3 11/15] Thermal: Introduce a step_wise " Durgadoss R
2012-09-01 11:51 ` [PATCHv3 12/15] Thermal: Register a governor for user space Durgadoss R
2012-09-10 8:37 ` Zhang Rui
2012-09-01 11:51 ` [PATCHv3 13/15] Thermal: Remove throttling logic out of thermal_sys.c Durgadoss R
2012-09-10 8:44 ` Zhang Rui
2012-09-10 8:56 ` R, Durgadoss
2012-09-11 0:24 ` Zhang Rui
2012-09-11 3:05 ` R, Durgadoss
2012-09-11 3:20 ` Zhang Rui
2012-09-11 3:39 ` R, Durgadoss
2012-09-01 11:51 ` [PATCHv3 14/15] Thermal: Add a notification API Durgadoss R
2012-09-01 11:51 ` [PATCHv3 15/15] Thermal: Add documentation for platform layer data Durgadoss R
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1346500296-25200-3-git-send-email-durgadoss.r@intel.com \
--to=durgadoss.r@intel.com \
--cc=eduardo.valentin@ti.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).