Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 20935
b: refs/heads/master
c: e2a002b
h: refs/heads/master
i:
  20933: 7742729
  20931: 5acdce2
  20927: ca77ac6
v: v3
  • Loading branch information
Benjamin Herrenschmidt authored and Paul Mackerras committed Mar 3, 2006
1 parent 59371ae commit 31bdaa8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b55fafc5a800f27beedfdcf8bd1b6baa47e769a9
refs/heads/master: e2a002b9a731083c69add71b1f5014bac7dc1770
6 changes: 4 additions & 2 deletions trunk/drivers/macintosh/windfarm_pm112.c
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ static void backside_fan_tick(void)
return;
if (!backside_tick) {
/* first time; initialize things */
printk(KERN_INFO "windfarm: Backside control loop started.\n");
backside_param.min = backside_fan->ops->get_min(backside_fan);
backside_param.max = backside_fan->ops->get_max(backside_fan);
wf_pid_init(&backside_pid, &backside_param);
Expand Down Expand Up @@ -407,6 +408,7 @@ static void drive_bay_fan_tick(void)
return;
if (!drive_bay_tick) {
/* first time; initialize things */
printk(KERN_INFO "windfarm: Drive bay control loop started.\n");
drive_bay_prm.min = drive_bay_fan->ops->get_min(drive_bay_fan);
drive_bay_prm.max = drive_bay_fan->ops->get_max(drive_bay_fan);
wf_pid_init(&drive_bay_pid, &drive_bay_prm);
Expand Down Expand Up @@ -458,6 +460,7 @@ static void slots_fan_tick(void)
return;
if (!slots_started) {
/* first time; initialize things */
printk(KERN_INFO "windfarm: Slots control loop started.\n");
wf_pid_init(&slots_pid, &slots_param);
slots_started = 1;
}
Expand Down Expand Up @@ -504,6 +507,7 @@ static void pm112_tick(void)

if (!started) {
started = 1;
printk(KERN_INFO "windfarm: CPUs control loops started.\n");
for (i = 0; i < nr_cores; ++i) {
if (create_cpu_loop(i) < 0) {
failure_state = FAILURE_PERM;
Expand Down Expand Up @@ -594,8 +598,6 @@ static void pm112_new_sensor(struct wf_sensor *sr)
{
unsigned int i;

if (have_all_sensors)
return;
if (!strncmp(sr->name, "cpu-temp-", 9)) {
i = sr->name[9] - '0';
if (sr->name[10] == 0 && i < NR_CORES &&
Expand Down

0 comments on commit 31bdaa8

Please sign in to comment.