From: Zhang Rui <rui.zhang@intel.com>
To: linux-pm@vger.kernel.org
Cc: Durgadoss R <durgadoss.r@intel.com>, Zhang Rui <rui.zhang@intel.com>
Subject: [PATCH 02/34] Thermal: Move thermal_instance to thermal_core.h
Date: Sun, 2 Dec 2012 22:44:36 +0800 [thread overview]
Message-ID: <1354459508-3707-2-git-send-email-rui.zhang@intel.com> (raw)
In-Reply-To: <1354459508-3707-1-git-send-email-rui.zhang@intel.com>
From: Durgadoss R <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>
Signed-off-by: Zhang Rui <rui.zhang@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 9ee42ca..bbc8346 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.7.6
next prev parent reply other threads:[~2012-12-02 14:45 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-02 14:44 [PATCH 01/34] Thermal: Refactor thermal.h file Zhang Rui
2012-12-02 14:44 ` Zhang Rui [this message]
2012-12-02 14:44 ` [PATCH 03/34] Thermal: Add get trend, get instance API's to thermal_sys Zhang Rui
2012-12-02 14:44 ` [PATCH 04/34] Thermal: Add platform level information to thermal.h Zhang Rui
2012-12-02 14:44 ` [PATCH 05/34] Thermal: Pass zone parameters as argument to tzd_register Zhang Rui
2012-12-02 14:44 ` [PATCH 06/34] Thermal: Add thermal governor registration APIs Zhang Rui
2012-12-02 14:44 ` [PATCH 07/34] Thermal: Add a policy sysfs attribute Zhang Rui
2012-12-02 14:44 ` [PATCH 08/34] Thermal: Update binding logic based on platform data Zhang Rui
2012-12-02 14:44 ` [PATCH 09/34] Thermal: Make thermal_cdev_update as a global function Zhang Rui
2012-12-02 14:44 ` [PATCH 10/34] Thermal: Introduce fair_share thermal governor Zhang Rui
2012-12-02 14:44 ` [PATCH 11/34] Thermal: Introduce a step_wise " Zhang Rui
2012-12-02 14:44 ` [PATCH 12/34] Thermal: Add a thermal notifier for user space Zhang Rui
2012-12-02 14:44 ` [PATCH 13/34] Thermal: Remove throttling logic out of thermal_sys.c Zhang Rui
2012-12-02 14:44 ` [PATCH 14/34] Thermal: Add a notification API Zhang Rui
2012-12-02 14:44 ` [PATCH 15/34] Thermal: Add documentation for platform layer data Zhang Rui
2012-12-02 14:44 ` [PATCH 16/34] Thermal: Provide option to choose default thermal governor Zhang Rui
2012-12-02 14:44 ` [PATCH 17/34] Thermal: Fix oops and unlocking in thermal_sys.c Zhang Rui
2012-12-02 14:44 ` [PATCH 18/34] thermal: step_wise: Add missing static storage class specifiers Zhang Rui
2012-12-02 14:44 ` [PATCH 19/34] thermal: fair_share: " Zhang Rui
2012-12-02 14:44 ` [PATCH 20/34] thermal: user_space: " Zhang Rui
2012-12-02 14:44 ` [PATCH 21/34] thermal: rcar_thermal: remove explicitly used devm_kfree/iounap() Zhang Rui
2012-12-02 14:44 ` [PATCH 22/34] Thermal: add indent for code alignment Zhang Rui
2012-12-02 14:44 ` [PATCH 23/34] Thermal: fix bug of counting cpu frequencies Zhang Rui
2012-12-02 14:44 ` [PATCH 24/34] Thermal: Remove the cooling_cpufreq_list Zhang Rui
2012-12-02 14:44 ` [PATCH 25/34] thermal: cpu_cooling: Make 'notify_device' static Zhang Rui
2012-12-02 14:45 ` [PATCH 26/34] Refactor drivers/thermal/Kconfig Zhang Rui
2012-12-02 14:45 ` [PATCH 27/34] Exynos: Add missing dependency Zhang Rui
2012-12-02 14:45 ` [PATCH 28/34] drivers/thermal/Makefile refactor Zhang Rui
2012-12-02 14:45 ` [PATCH 29/34] Thermal: Add ST-Ericsson DB8500 thermal driver Zhang Rui
2012-12-02 14:45 ` [PATCH 30/34] Thermal: Add ST-Ericsson DB8500 thermal properties and platform data Zhang Rui
2012-12-02 14:45 ` [PATCH 31/34] thermal: cpu cooling: use const parameter while registering Zhang Rui
2012-12-02 14:45 ` [PATCH 32/34] thermal: cpu cooling: allow module builds Zhang Rui
2012-12-02 14:45 ` [PATCH 33/34] thermal: rcar: fixup the unit of temperature Zhang Rui
2012-12-02 14:45 ` [PATCH 34/34] thermal: rcar: add rcar_zone_to_priv() macro Zhang Rui
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=1354459508-3707-2-git-send-email-rui.zhang@intel.com \
--to=rui.zhang@intel.com \
--cc=durgadoss.r@intel.com \
--cc=linux-pm@vger.kernel.org \
/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).