[PATCH] powerpc: Thermal control for dual core G5s

This patch adds a windfarm module, windfarm_pm112, for the dual core G5s
(both 2 and 4 core models), keeping the machine from getting into
vacuum-cleaner mode ;) For proper credits, the patch was initially
written by Paul Mackerras, and slightly reworked by me to add overtemp
handling among others. The patch also removes the sysfs attributes from
windfarm_pm81 and windfarm_pm91 and instead adds code to the windfarm
core to automagically expose attributes for sensor & controls.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 12 insertions, 75 deletions

diff --git a/drivers/macintosh/windfarm_pm81.c b/drivers/macintosh/windfarm_pm81.c
index eb69a601e765..f1df6efcbe68 100644
--- a/drivers/macintosh/windfarm_pm81.c
+++ b/drivers/macintosh/windfarm_pm81.c
@@ -538,45 +538,6 @@ static void wf_smu_cpu_fans_tick(struct wf_smu_cpu_fans_state *st)
         }
 }
 
-
-/*
- * ****** Attributes ******
- *
- */
-
-#define BUILD_SHOW_FUNC_FIX(name, data)                         \
-static ssize_t show_##name(struct device *dev,                  \
-                           struct device_attribute *attr,       \
-                           char *buf)                           \
-{                                                               \
-        ssize_t r;                                              \
-        s32 val = 0;                                            \
-        data->ops->get_value(data, &val);                       \
-        r = sprintf(buf, "%d.%03d", FIX32TOPRINT(val));         \
-        return r;                                               \
-}                                                               \
-static DEVICE_ATTR(name,S_IRUGO,show_##name, NULL);
-
-
-#define BUILD_SHOW_FUNC_INT(name, data)                         \
-static ssize_t show_##name(struct device *dev,                  \
-                           struct device_attribute *attr,       \
-                           char *buf)                           \
-{                                                               \
-        s32 val = 0;                                            \
-        data->ops->get_value(data, &val);                       \
-        return sprintf(buf, "%d", val);                         \
-}                                                               \
-static DEVICE_ATTR(name,S_IRUGO,show_##name, NULL);
-
-BUILD_SHOW_FUNC_INT(cpu_fan, fan_cpu_main);
-BUILD_SHOW_FUNC_INT(sys_fan, fan_system);
-BUILD_SHOW_FUNC_INT(hd_fan, fan_hd);
-
-BUILD_SHOW_FUNC_FIX(cpu_temp, sensor_cpu_temp);
-BUILD_SHOW_FUNC_FIX(cpu_power, sensor_cpu_power);
-BUILD_SHOW_FUNC_FIX(hd_temp, sensor_hd_temp);
-
 /*
  * ****** Setup / Init / Misc ... ******
  *
@@ -654,17 +615,13 @@ static void wf_smu_new_control(struct wf_control *ct)
                 return;
 
         if (fan_cpu_main == NULL && !strcmp(ct->name, "cpu-fan")) {
-                if (wf_get_control(ct) == 0) {
+                if (wf_get_control(ct) == 0)
                         fan_cpu_main = ct;
-                        device_create_file(wf_smu_dev, &dev_attr_cpu_fan);
-                }
         }
 
         if (fan_system == NULL && !strcmp(ct->name, "system-fan")) {
-                if (wf_get_control(ct) == 0) {
+                if (wf_get_control(ct) == 0)
                         fan_system = ct;
-                        device_create_file(wf_smu_dev, &dev_attr_sys_fan);
-                }
         }
 
         if (cpufreq_clamp == NULL && !strcmp(ct->name, "cpufreq-clamp")) {
@@ -683,10 +640,8 @@ static void wf_smu_new_control(struct wf_control *ct)
         }
 
         if (fan_hd == NULL && !strcmp(ct->name, "drive-bay-fan")) {
-                if (wf_get_control(ct) == 0) {
+                if (wf_get_control(ct) == 0)
                         fan_hd = ct;
-                        device_create_file(wf_smu_dev, &dev_attr_hd_fan);
-                }
         }
 
         if (fan_system && fan_hd && fan_cpu_main && cpufreq_clamp)
@@ -699,24 +654,18 @@ static void wf_smu_new_sensor(struct wf_sensor *sr)
                 return;
 
         if (sensor_cpu_power == NULL && !strcmp(sr->name, "cpu-power")) {
-                if (wf_get_sensor(sr) == 0) {
+                if (wf_get_sensor(sr) == 0)
                         sensor_cpu_power = sr;
-                        device_create_file(wf_smu_dev, &dev_attr_cpu_power);
-                }
         }
 
         if (sensor_cpu_temp == NULL && !strcmp(sr->name, "cpu-temp")) {
-                if (wf_get_sensor(sr) == 0) {
+                if (wf_get_sensor(sr) == 0)
                         sensor_cpu_temp = sr;
-                        device_create_file(wf_smu_dev, &dev_attr_cpu_temp);
-                }
         }
 
         if (sensor_hd_temp == NULL && !strcmp(sr->name, "hd-temp")) {
-                if (wf_get_sensor(sr) == 0) {
+                if (wf_get_sensor(sr) == 0)
                         sensor_hd_temp = sr;
-                        device_create_file(wf_smu_dev, &dev_attr_hd_temp);
-                }
         }
 
         if (sensor_cpu_power && sensor_cpu_temp && sensor_hd_temp)
@@ -794,32 +743,20 @@ static int wf_smu_remove(struct device *ddev)
          * with that except by adding locks all over... I'll do that
          * eventually but heh, who ever rmmod this module anyway ?
          */
-        if (sensor_cpu_power) {
-                device_remove_file(wf_smu_dev, &dev_attr_cpu_power);
+        if (sensor_cpu_power)
                 wf_put_sensor(sensor_cpu_power);
-        }
-        if (sensor_cpu_temp) {
-                device_remove_file(wf_smu_dev, &dev_attr_cpu_temp);
+        if (sensor_cpu_temp)
                 wf_put_sensor(sensor_cpu_temp);
-        }
-        if (sensor_hd_temp) {
-                device_remove_file(wf_smu_dev, &dev_attr_hd_temp);
+        if (sensor_hd_temp)
                 wf_put_sensor(sensor_hd_temp);
-        }
 
         /* Release all controls */
-        if (fan_cpu_main) {
-                device_remove_file(wf_smu_dev, &dev_attr_cpu_fan);
+        if (fan_cpu_main)
                 wf_put_control(fan_cpu_main);
-        }
-        if (fan_hd) {
-                device_remove_file(wf_smu_dev, &dev_attr_hd_fan);
+        if (fan_hd)
                 wf_put_control(fan_hd);
-        }
-        if (fan_system) {
-                device_remove_file(wf_smu_dev, &dev_attr_sys_fan);
+        if (fan_system)
                 wf_put_control(fan_system);
-        }
         if (cpufreq_clamp)
                 wf_put_control(cpufreq_clamp);