rename thread_info to stack

[powerpc.git] / drivers / macintosh / windfarm_smu_sat.c

diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c
index aceb61d..1043b39 100644 (file)
--- a/drivers/macintosh/windfarm_smu_sat.c
+++ b/drivers/macintosh/windfarm_smu_sat.c
@@ -241,7 +241,7 @@ static void wf_sat_create(struct i2c_adapter *adapter, struct device_node *dev)
        char *name;
        int vsens[2], isens[2];
 
-       reg = get_property(dev, "reg", NULL);
+       reg = of_get_property(dev, "reg", NULL);
        if (reg == NULL)
                return;
        addr = *reg;
@@ -268,9 +268,9 @@ static void wf_sat_create(struct i2c_adapter *adapter, struct device_node *dev)
        isens[0] = isens[1] = -1;
        child = NULL;
        while ((child = of_get_next_child(dev, child)) != NULL) {
-               reg = get_property(child, "reg", NULL);
-               type = get_property(child, "device_type", NULL);
-               loc = get_property(child, "location", NULL);
+               reg = of_get_property(child, "reg", NULL);
+               type = of_get_property(child, "device_type", NULL);
+               loc = of_get_property(child, "location", NULL);
                if (reg == NULL || loc == NULL)
                        continue;
 
@@ -380,7 +380,7 @@ static int wf_sat_attach(struct i2c_adapter *adapter)
        busnode = pmac_i2c_get_bus_node(bus);
 
        while ((dev = of_get_next_child(busnode, dev)) != NULL)
-               if (device_is_compatible(dev, "smu-sat"))
+               if (of_device_is_compatible(dev, "smu-sat"))
                        wf_sat_create(adapter, dev);
        return 0;
 }
@@ -397,12 +397,7 @@ static int wf_sat_detach(struct i2c_client *client)
 
 static int __init sat_sensors_init(void)
 {
-       int err;
-
-       err = i2c_add_driver(&wf_sat_driver);
-       if (err < 0)
-               return err;
-       return 0;
+       return i2c_add_driver(&wf_sat_driver);
 }
 
 static void __exit sat_sensors_exit(void)