Update drivers names to the ones invoked by i2c-powermac:
- therm_ds1775 -> MAC,ds1775
- therm_adm1030 -> MAC,adm1030
The background fan control loop is started from
the devices probing methods.
Signed-off-by: Goffredo Baroncelli <[email protected]>
---
drivers/macintosh/therm_windtunnel.c | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index 3b4a157..a64a06f 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -334,6 +334,23 @@ do_attach( struct i2c_adapter *adapter )
return 0;
}
+static void
+try_start_control_loop(void)
+{
+
+ mutex_lock(&x.lock);
+ if (!x.thermostat || !x.fan || x.running) {
+ mutex_unlock(&x.lock);
+ return;
+ }
+
+ x.running = 1;
+ mutex_unlock(&x.lock);
+
+ x.poll_task = kthread_run(control_loop, NULL, "g4fand");
+
+}
+
static int
do_remove(struct i2c_client *client)
{
@@ -364,6 +381,7 @@ attach_fan( struct i2c_client *cl )
printk("ADM1030 fan controller [@%02x]\n", cl->addr );
x.fan = cl;
+ try_start_control_loop();
out:
return 0;
}
@@ -397,6 +415,7 @@ attach_thermostat( struct i2c_client *cl )
x.overheat_temp = os_temp;
x.overheat_hyst = hyst_temp;
x.thermostat = cl;
+ try_start_control_loop();
out:
return 0;
}
@@ -404,8 +423,8 @@ out:
enum chip { ds1775, adm1030 };
static const struct i2c_device_id therm_windtunnel_id[] = {
- { "therm_ds1775", ds1775 },
- { "therm_adm1030", adm1030 },
+ { "MAC,ds1775", ds1775 },
+ { "MAC,adm1030", adm1030 },
{ }
};
--
2.1.0.rc1