[28/48] thermal: Add event notification to thermal framework

Commit Message

Thomas Renninger Jan. 13, 2011, 11:14 a.m. UTC

None

Patch

diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 5bbacff..02283f3 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -78,7 +78,7 @@  static struct genl_multicast_group thermal_event_mcgrp = {
 static int genetlink_init(void);
 static void genetlink_exit(void);
 
-int generate_netlink_event(u32 orig, enum events event)
+int thermal_netlink_event(u32 orig, enum events event)
 {
 	struct sk_buff *skb;
 	struct nlattr *attr;
@@ -137,7 +137,7 @@  int generate_netlink_event(u32 orig, enum events event)
 
 	return result;
 }
-EXPORT_SYMBOL(generate_netlink_event);
+EXPORT_SYMBOL(thermal_netlink_event);
 
 static int genetlink_init(void)
 {
@@ -163,8 +163,8 @@  static void genetlink_exit(void)
 
 static void genetlink_exit(void) {};
 static int genetlink_init(void) { return 0; }
-int generate_netlink_event(u32 orig, enum events event) { return 0; }
-EXPORT_SYMBOL(generate_netlink_event);
+int thermal_netlink_event(u32 orig, enum events event) { return 0; }
+EXPORT_SYMBOL(thermal_netlink_event);
 
 #endif /* CONFIG_NET */
 
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 1c31614..c24756e 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -161,7 +161,7 @@  enum {
 };
 #define THERMAL_GENL_CMD_MAX (__THERMAL_GENL_CMD_MAX - 1)
 #endif
-extern int generate_netlink_event(u32 orig, enum events event);
+extern int thermal_netlink_event(u32 orig, enum events event);
 
 struct thermal_zone_device *thermal_zone_device_register(char *, int, void *,
 		const struct thermal_zone_device_ops *, int tc1, int tc2,