20 files changed, 91 insertions, 222 deletions
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index f729eebf771f..adfea3c7c62a 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -90,7 +90,7 @@ static int autopoll_devs;
 int __adb_probe_sync;
 #ifdef CONFIG_PM
-static int adb_notify_sleep(struct pmu_sleep_notifier *self, int when);
+static void adb_notify_sleep(struct pmu_sleep_notifier *self, int when);
 static struct pmu_sleep_notifier adb_sleep_notifier = {
        adb_notify_sleep,
        SLEEP_LEVEL_ADB,
@@ -340,11 +340,9 @@ __initcall(adb_init);
 /*
 * notify clients before sleep and reset bus afterwards
 */
-int
+void
 adb_notify_sleep(struct pmu_sleep_notifier *self, int when)
 {
-        int ret;
-        
        switch (when) {
        case PBOOK_SLEEP_REQUEST:
                adb_got_sleep = 1;
@@ -353,22 +351,8 @@ adb_notify_sleep(struct pmu_sleep_notifier *self, int when)
                /* Stop autopoll */
                if (adb_controller->autopoll)
                        adb_controller->autopoll(0);
-                ret = blocking_notifier_call_chain(&adb_client_list,
+                blocking_notifier_call_chain(&adb_client_list,
-                                ADB_MSG_POWERDOWN, NULL);
+                        ADB_MSG_POWERDOWN, NULL);
-                if (ret & NOTIFY_STOP_MASK) {
-                        up(&adb_probe_mutex);
-                        return PBOOK_SLEEP_REFUSE;
-                }
-                break;
-        case PBOOK_SLEEP_REJECT:
-                if (adb_got_sleep) {
-                        adb_got_sleep = 0;
-                        up(&adb_probe_mutex);
-                        adb_reset_bus();
-                }
-                break;
-                
-        case PBOOK_SLEEP_NOW:
                break;
        case PBOOK_WAKE:
                adb_got_sleep = 0;
@@ -376,14 +360,13 @@ adb_notify_sleep(struct pmu_sleep_notifier *self, int when)
                adb_reset_bus();
                break;
        }
-        return PBOOK_SLEEP_OK;
 }
 #endif /* CONFIG_PM */
 static int
 do_adb_reset_bus(void)
 {
-        int ret, nret;
+        int ret;
        
        if (adb_controller == NULL)
                return -ENXIO;
@@ -391,13 +374,8 @@ do_adb_reset_bus(void)
        if (adb_controller->autopoll)
                adb_controller->autopoll(0);
-        nret = blocking_notifier_call_chain(&adb_client_list,
+        blocking_notifier_call_chain(&adb_client_list,
-                        ADB_MSG_PRE_RESET, NULL);
+                ADB_MSG_PRE_RESET, NULL);
-        if (nret & NOTIFY_STOP_MASK) {
-                if (adb_controller->autopoll)
-                        adb_controller->autopoll(autopoll_devs);
-                return -EBUSY;
-        }
        if (sleepy_trackpad) {
                /* Let the trackpad settle down */
@@ -427,10 +405,8 @@ do_adb_reset_bus(void)
        }
        up(&adb_handler_sem);
-        nret = blocking_notifier_call_chain(&adb_client_list,
+        blocking_notifier_call_chain(&adb_client_list,
-                        ADB_MSG_POST_RESET, NULL);
+                ADB_MSG_POST_RESET, NULL);
-        if (nret & NOTIFY_STOP_MASK)
-                return -EBUSY;
        
        return ret;
 }
diff --git a/drivers/macintosh/ans-lcd.c b/drivers/macintosh/ans-lcd.c
index cdd5a0f72e3c..e54c4d9f6365 100644
--- a/drivers/macintosh/ans-lcd.c
+++ b/drivers/macintosh/ans-lcd.c
@@ -145,11 +145,12 @@ anslcd_init(void)
        int retval;
        struct device_node* node;
-        node = find_devices("lcd");
+        node = of_find_node_by_name(NULL, "lcd");
-        if (!node || !node->parent)
+        if (!node || !node->parent || strcmp(node->parent->name, "gc")) {
-                return -ENODEV;
+                of_node_put(node);
-        if (strcmp(node->parent->name, "gc"))
                return -ENODEV;
+        }
+        of_node_put(node);
        anslcd_ptr = ioremap(ANSLCD_ADDR, 0x20);
        
diff --git a/drivers/macintosh/apm_emu.c b/drivers/macintosh/apm_emu.c
index c5e4d43f97fc..cdb0bead9917 100644
--- a/drivers/macintosh/apm_emu.c
+++ b/drivers/macintosh/apm_emu.c
@@ -96,7 +96,7 @@ static DECLARE_WAIT_QUEUE_HEAD(apm_waitqueue);
 static DECLARE_WAIT_QUEUE_HEAD(apm_suspend_waitqueue);
 static struct apm_user *        user_list;
-static int apm_notify_sleep(struct pmu_sleep_notifier *self, int when);
+static void apm_notify_sleep(struct pmu_sleep_notifier *self, int when);
 static struct pmu_sleep_notifier apm_sleep_notifier = {
        apm_notify_sleep,
        SLEEP_LEVEL_USERLAND,
@@ -352,7 +352,7 @@ static int do_open(struct inode * inode, struct file * filp)
 * doesn't provide a way to NAK, but this could be added
 * here.
 */
-static int wait_all_suspend(void)
+static void wait_all_suspend(void)
 {
        DECLARE_WAITQUEUE(wait, current);
@@ -366,24 +366,19 @@ static int wait_all_suspend(void)
        remove_wait_queue(&apm_suspend_waitqueue, &wait);
        DBG("apm_emu: wait_all_suspend() - complete !\n");
-        
-        return 1;
 }
-static int apm_notify_sleep(struct pmu_sleep_notifier *self, int when)
+static void apm_notify_sleep(struct pmu_sleep_notifier *self, int when)
 {
        switch(when) {
                case PBOOK_SLEEP_REQUEST:
                        queue_event(APM_SYS_SUSPEND, NULL);
-                        if (!wait_all_suspend())
+                        wait_all_suspend();
-                                return PBOOK_SLEEP_REFUSE;
                        break;
-                case PBOOK_SLEEP_REJECT:
                case PBOOK_WAKE:
                        queue_event(APM_NORMAL_RESUME, NULL);
                        break;
        }
-        return PBOOK_SLEEP_OK;
 }
 #define APM_CRITICAL            10
diff --git a/drivers/macintosh/mac_hid.c b/drivers/macintosh/mac_hid.c
index c1fd816e9f09..1599dc34f15f 100644
--- a/drivers/macintosh/mac_hid.c
+++ b/drivers/macintosh/mac_hid.c
@@ -102,8 +102,6 @@ int mac_hid_mouse_emulate_buttons(int caller, unsigned int keycode, int down)
        return 0;
 }
-EXPORT_SYMBOL(mac_hid_mouse_emulate_buttons);
 static int emumousebtn_input_register(void)
 {
        int ret;
diff --git a/drivers/macintosh/macio-adb.c b/drivers/macintosh/macio-adb.c
index 026b67f4f659..79119f56e82d 100644
--- a/drivers/macintosh/macio-adb.c
+++ b/drivers/macintosh/macio-adb.c
@@ -82,7 +82,14 @@ struct adb_driver macio_adb_driver = {
 int macio_probe(void)
 {
-        return find_compatible_devices("adb", "chrp,adb0")? 0: -ENODEV;
+        struct device_node *np;
+        np = of_find_compatible_node(NULL, "adb", "chrp,adb0");
+        if (np) {
+                of_node_put(np);
+                return 0;
+        }
+        return -ENODEV;
 }
 int macio_init(void)
@@ -91,12 +98,14 @@ int macio_init(void)
        struct resource r;
        unsigned int irq;
-        adbs = find_compatible_devices("adb", "chrp,adb0");
+        adbs = of_find_compatible_node(NULL, "adb", "chrp,adb0");
        if (adbs == 0)
                return -ENXIO;
-        if (of_address_to_resource(adbs, 0, &r))
+        if (of_address_to_resource(adbs, 0, &r)) {
+                of_node_put(adbs);
                return -ENXIO;
+        }
        adb = ioremap(r.start, sizeof(struct adb_regs));
        out_8(&adb->ctrl.r, 0);
@@ -107,6 +116,7 @@ int macio_init(void)
        out_8(&adb->autopoll.r, APE);
        irq = irq_of_parse_and_map(adbs, 0);
+        of_node_put(adbs);
        if (request_irq(irq, macio_adb_interrupt, 0, "ADB", (void *)0)) {
                printk(KERN_ERR "ADB: can't get irq %d\n", irq);
                return -EAGAIN;
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index d56216067549..c96b7fe882a4 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -134,108 +134,12 @@ static int macio_device_resume(struct device * dev)
        return 0;
 }
-static int macio_uevent(struct device *dev, char **envp, int num_envp,
-                          char *buffer, int buffer_size)
-{
-        struct macio_dev * macio_dev;
-        struct of_device * of;
-        char *scratch;
-        const char *compat, *compat2;
-        int i = 0;
-        int length, cplen, cplen2, seen = 0;
-        if (!dev)
-                return -ENODEV;
-        macio_dev = to_macio_device(dev);
-        if (!macio_dev)
-                return -ENODEV;
-        of = &macio_dev->ofdev;
-        /* stuff we want to pass to /sbin/hotplug */
-        envp[i++] = scratch = buffer;
-        length = scnprintf (scratch, buffer_size, "OF_NAME=%s", of->node->name);
-        ++length;
-        buffer_size -= length;
-        if ((buffer_size <= 0) || (i >= num_envp))
-                return -ENOMEM;
-        scratch += length;
-        envp[i++] = scratch;
-        length = scnprintf (scratch, buffer_size, "OF_TYPE=%s", of->node->type);
-        ++length;
-        buffer_size -= length;
-        if ((buffer_size <= 0) || (i >= num_envp))
-                return -ENOMEM;
-        scratch += length;
-        /* Since the compatible field can contain pretty much anything
-         * it's not really legal to split it out with commas. We split it
-         * up using a number of environment variables instead. */
-        compat = get_property(of->node, "compatible", &cplen);
-        compat2 = compat;
-        cplen2= cplen;
-        while (compat && cplen > 0) {
-                envp[i++] = scratch;
-                length = scnprintf (scratch, buffer_size,
-                                     "OF_COMPATIBLE_%d=%s", seen, compat);
-                ++length;
-                buffer_size -= length;
-                if ((buffer_size <= 0) || (i >= num_envp))
-                        return -ENOMEM;
-                scratch += length;
-                length = strlen (compat) + 1;
-                compat += length;
-                cplen -= length;
-                seen++;
-        }
-        envp[i++] = scratch;
-        length = scnprintf (scratch, buffer_size, "OF_COMPATIBLE_N=%d", seen);
-        ++length;
-        buffer_size -= length;
-        if ((buffer_size <= 0) || (i >= num_envp))
-                return -ENOMEM;
-        scratch += length;
-        envp[i++] = scratch;
-        length = scnprintf (scratch, buffer_size, "MODALIAS=of:N%sT%s",
-                        of->node->name, of->node->type);
-        /* overwrite '\0' */
-        buffer_size -= length;
-        if ((buffer_size <= 0) || (i >= num_envp))
-                return -ENOMEM;
-        scratch += length;
-        if (!compat2) {
-                compat2 = "";
-                cplen2 = 1;
-        }
-        while (cplen2 > 0) {
-                length = snprintf (scratch, buffer_size, "C%s", compat2);
-                buffer_size -= length;
-                if (buffer_size <= 0)
-                        return -ENOMEM;
-                scratch += length;
-                length = strlen (compat2) + 1;
-                compat2 += length;
-                cplen2 -= length;
-        }
-        envp[i] = NULL;
-        return 0;
-}
 extern struct device_attribute macio_dev_attrs[];
 struct bus_type macio_bus_type = {
       .name    = "macio",
       .match   = macio_bus_match,
-       .uevent = macio_uevent,
+       .uevent = of_device_uevent,
       .probe   = macio_device_probe,
       .remove  = macio_device_remove,
       .shutdown = macio_device_shutdown,
@@ -491,7 +395,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
 #endif
                        MAX_NODE_NAME_SIZE, np->name);
        } else {
-                reg = get_property(np, "reg", NULL);
+                reg = of_get_property(np, "reg", NULL);
                sprintf(dev->ofdev.dev.bus_id, "%1d.%08x:%.*s",
                        chip->lbus.index,
                        reg ? *reg : 0, MAX_NODE_NAME_SIZE, np->name);
diff --git a/drivers/macintosh/macio_sysfs.c b/drivers/macintosh/macio_sysfs.c
index 8566bdfdd4b8..cc8267912656 100644
--- a/drivers/macintosh/macio_sysfs.c
+++ b/drivers/macintosh/macio_sysfs.c
@@ -21,7 +21,7 @@ compatible_show (struct device *dev, struct device_attribute *attr, char *buf)
        int length = 0;
        of = &to_macio_device (dev)->ofdev;
-        compat = get_property(of->node, "compatible", &cplen);
+        compat = of_get_property(of->node, "compatible", &cplen);
        if (!compat) {
                *buf = '\0';
                return 0;
@@ -47,18 +47,20 @@ static ssize_t modalias_show (struct device *dev, struct device_attribute *attr,
        int length;
        of = &to_macio_device (dev)->ofdev;
-        compat = get_property(of->node, "compatible", &cplen);
+        compat = of_get_property(of->node, "compatible", &cplen);
        if (!compat) compat = "", cplen = 1;
        length = sprintf (buf, "of:N%sT%s", of->node->name, of->node->type);
        buf += length;
        while (cplen > 0) {
                int l;
-                length += sprintf (buf, "C%s", compat);
+                l = sprintf (buf, "C%s", compat);
-                buf += length;
+                length += l;
+                buf += l;
                l = strlen (compat) + 1;
                compat += l;
                cplen -= l;
        }
+        length += sprintf(buf, "\n");
        return length;
 }
diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c
index f83fad2a3ff4..4177ff004753 100644
--- a/drivers/macintosh/rack-meter.c
+++ b/drivers/macintosh/rack-meter.c
@@ -387,7 +387,7 @@ static int __devinit rackmeter_probe(struct macio_dev* mdev,
               if (strcmp(np->name, "lightshow") == 0)
                       break;
               if ((strcmp(np->name, "sound") == 0) &&
-                   get_property(np, "virtual", NULL) != NULL)
+                   of_get_property(np, "virtual", NULL) != NULL)
                       break;
        }
        if (np == NULL) {
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index c9f3dc4fd3ee..a98a328b1cfc 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -491,7 +491,7 @@ int __init smu_init (void)
                printk(KERN_ERR "SMU: Can't find doorbell GPIO !\n");
                goto fail;
        }
-        data = get_property(smu->db_node, "reg", NULL);
+        data = of_get_property(smu->db_node, "reg", NULL);
        if (data == NULL) {
                of_node_put(smu->db_node);
                smu->db_node = NULL;
@@ -512,7 +512,7 @@ int __init smu_init (void)
                smu->msg_node = of_find_node_by_name(NULL, "smu-interrupt");
                if (smu->msg_node == NULL)
                        break;
-                data = get_property(smu->msg_node, "reg", NULL);
+                data = of_get_property(smu->msg_node, "reg", NULL);
                if (data == NULL) {
                        of_node_put(smu->msg_node);
                        smu->msg_node = NULL;
@@ -952,7 +952,7 @@ static struct smu_sdbp_header *smu_create_sdb_partition(int id)
        prop->name = ((char *)prop) + tlen - 18;
        sprintf(prop->name, "sdb-partition-%02x", id);
        prop->length = len;
-        prop->value = (unsigned char *)hdr;
+        prop->value = hdr;
        prop->next = NULL;
        /* Read the datablock */
@@ -1004,7 +1004,7 @@ const struct smu_sdbp_header *__smu_get_sdb_partition(int id,
        } else
                mutex_lock(&smu_part_access);
-        part = get_property(smu->of_node, pname, size);
+        part = of_get_property(smu->of_node, pname, size);
        if (part == NULL) {
                DPRINTK("trying to extract from SMU ...\n");
                part = smu_create_sdb_partition(id);
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index a7ce55926638..228903403cfc 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -567,13 +567,13 @@ thermostat_init(void)
        else
                return -ENODEV;
-        prop = get_property(np, "hwsensor-params-version", NULL);
+        prop = of_get_property(np, "hwsensor-params-version", NULL);
        printk(KERN_INFO "adt746x: version %d (%ssupported)\n", *prop,
                         (*prop == 1)?"":"un");
        if (*prop != 1)
                return -ENODEV;
-        prop = get_property(np, "reg", NULL);
+        prop = of_get_property(np, "reg", NULL);
        if (!prop)
                return -ENODEV;
@@ -591,9 +591,9 @@ thermostat_init(void)
                         "limit_adjust: %d, fan_speed: %d\n",
                         therm_bus, therm_address, limit_adjust, fan_speed);
-        if (get_property(np, "hwsensor-location", NULL)) {
+        if (of_get_property(np, "hwsensor-location", NULL)) {
                for (i = 0; i < 3; i++) {
-                        sensor_location[i] = get_property(np,
+                        sensor_location[i] = of_get_property(np,
                                        "hwsensor-location", NULL) + offset;
                        if (sensor_location[i] == NULL)
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index 2e4ad44a8636..78ff18617139 100644
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -674,7 +674,7 @@ static int read_eeprom(int cpu, struct mpu_data *out)
                printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid node from device-tree\n");
                return -ENODEV;
        }
-        data = get_property(np, "cpuid", &len);
+        data = of_get_property(np, "cpuid", &len);
        if (data == NULL) {
                printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid property from device-tree\n");
                of_node_put(np);
@@ -1337,7 +1337,7 @@ static int init_backside_state(struct backside_pid_state *state)
         */
        u3 = of_find_node_by_path("/u3@0,f8000000");
        if (u3 != NULL) {
-                const u32 *vers = get_property(u3, "device-rev", NULL);
+                const u32 *vers = of_get_property(u3, "device-rev", NULL);
                if (vers)
                        if (((*vers) & 0x3f) < 0x34)
                                u3h = 0;
@@ -2129,8 +2129,8 @@ static void fcu_lookup_fans(struct device_node *fcu_node)
                        continue;
                /* Lookup for a matching location */
-                loc = get_property(np, "location", NULL);
+                loc = of_get_property(np, "location", NULL);
-                reg = get_property(np, "reg", NULL);
+                reg = of_get_property(np, "reg", NULL);
                if (loc == NULL || reg == NULL)
                        continue;
                DBG(" matching location: %s, reg: 0x%08x\n", loc, *reg);
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index a1d3a987cb3a..35233de460ad 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -492,7 +492,7 @@ g4fan_init( void )
        if( !(np=of_find_node_by_name(NULL, "power-mgt")) )
                return -ENODEV;
-        info = get_property(np, "thermal-info", NULL);
+        info = of_get_property(np, "thermal-info", NULL);
        of_node_put(np);
        if( !info || !machine_is_compatible("PowerMac3,6") )
diff --git a/drivers/macintosh/via-cuda.c b/drivers/macintosh/via-cuda.c
index d58fcf6cca0a..76d21775fc35 100644
--- a/drivers/macintosh/via-cuda.c
+++ b/drivers/macintosh/via-cuda.c
@@ -131,7 +131,7 @@ int __init find_via_cuda(void)
    if (vias == 0)
        return 0;
-    reg = get_property(vias, "reg", NULL);
+    reg = of_get_property(vias, "reg", NULL);
    if (reg == NULL) {
            printk(KERN_ERR "via-cuda: No \"reg\" property !\n");
            goto fail;
diff --git a/drivers/macintosh/via-pmu-led.c b/drivers/macintosh/via-pmu-led.c
index 179af10105d9..fc89a7047cd0 100644
--- a/drivers/macintosh/via-pmu-led.c
+++ b/drivers/macintosh/via-pmu-led.c
@@ -81,7 +81,7 @@ static struct led_classdev pmu_led = {
 };
 #ifdef CONFIG_PM
-static int pmu_led_sleep_call(struct pmu_sleep_notifier *self, int when)
+static void pmu_led_sleep_call(struct pmu_sleep_notifier *self, int when)
 {
        unsigned long flags;
@@ -99,8 +99,6 @@ static int pmu_led_sleep_call(struct pmu_sleep_notifier *self, int when)
                break;
        }
        spin_unlock_irqrestore(&pmu_blink_lock, flags);
-        return PBOOK_SLEEP_OK;
 }
 static struct pmu_sleep_notifier via_pmu_led_sleep_notif = {
@@ -120,11 +118,13 @@ static int __init via_pmu_led_init(void)
        dt = of_find_node_by_path("/");
        if (dt == NULL)
                return -ENODEV;
-        model = get_property(dt, "model", NULL);
+        model = of_get_property(dt, "model", NULL);
        if (model == NULL)
                return -ENODEV;
        if (strncmp(model, "PowerBook", strlen("PowerBook")) != 0 &&
-            strncmp(model, "iBook", strlen("iBook")) != 0) {
+            strncmp(model, "iBook", strlen("iBook")) != 0 &&
+            strcmp(model, "PowerMac7,2") != 0 &&
+            strcmp(model, "PowerMac7,3") != 0) {
                of_node_put(dt);
                /* ignore */
                return -ENODEV;
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index b6073bdb50c3..1729d3fd7a11 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -289,7 +289,7 @@ int __init find_via_pmu(void)
        if (vias == NULL)
                return 0;
-        reg = get_property(vias, "reg", NULL);
+        reg = of_get_property(vias, "reg", NULL);
        if (reg == NULL) {
                printk(KERN_ERR "via-pmu: No \"reg\" property !\n");
                goto fail;
@@ -319,10 +319,13 @@ int __init find_via_pmu(void)
        else if (device_is_compatible(vias->parent, "Keylargo")
                 || device_is_compatible(vias->parent, "K2-Keylargo")) {
                struct device_node *gpiop;
+                struct device_node *adbp;
                u64 gaddr = OF_BAD_ADDR;
                pmu_kind = PMU_KEYLARGO_BASED;
-                pmu_has_adb = (find_type_devices("adb") != NULL);
+                adbp = of_find_node_by_type(NULL, "adb");
+                pmu_has_adb = (adbp != NULL);
+                of_node_put(adbp);
                pmu_intr_mask = PMU_INT_PCEJECT |
                                PMU_INT_SNDBRT |
                                PMU_INT_ADB |
@@ -331,7 +334,7 @@ int __init find_via_pmu(void)
                
                gpiop = of_find_node_by_name(NULL, "gpio");
                if (gpiop) {
-                        reg = get_property(gpiop, "reg", NULL);
+                        reg = of_get_property(gpiop, "reg", NULL);
                        if (reg)
                                gaddr = of_translate_address(gpiop, reg);
                        if (gaddr != OF_BAD_ADDR)
@@ -484,10 +487,11 @@ static int __init via_pmu_dev_init(void)
                pmu_batteries[0].flags |= PMU_BATT_TYPE_SMART;
                pmu_batteries[1].flags |= PMU_BATT_TYPE_SMART;
        } else {
-                struct device_node* prim = find_devices("power-mgt");
+                struct device_node* prim =
+                        of_find_node_by_name(NULL, "power-mgt");
                const u32 *prim_info = NULL;
                if (prim)
-                        prim_info = get_property(prim, "prim-info", NULL);
+                        prim_info = of_get_property(prim, "prim-info", NULL);
                if (prim_info) {
                        /* Other stuffs here yet unknown */
                        pmu_battery_count = (prim_info[6] >> 16) & 0xff;
@@ -495,6 +499,7 @@ static int __init via_pmu_dev_init(void)
                        if (pmu_battery_count > 1)
                                pmu_batteries[1].flags |= PMU_BATT_TYPE_SMART;
                }
+                of_node_put(prim);
        }
 #endif /* CONFIG_PPC32 */
@@ -1769,35 +1774,21 @@ EXPORT_SYMBOL(pmu_unregister_sleep_notifier);
 #if defined(CONFIG_PM) && defined(CONFIG_PPC32)
 /* Sleep is broadcast last-to-first */
-static int
+static void broadcast_sleep(int when)
-broadcast_sleep(int when, int fallback)
 {
-        int ret = PBOOK_SLEEP_OK;
        struct list_head *list;
        struct pmu_sleep_notifier *notifier;
        for (list = sleep_notifiers.prev; list != &sleep_notifiers;
             list = list->prev) {
                notifier = list_entry(list, struct pmu_sleep_notifier, list);
-                ret = notifier->notifier_call(notifier, when);
+                notifier->notifier_call(notifier, when);
-                if (ret != PBOOK_SLEEP_OK) {
-                        printk(KERN_DEBUG "sleep %d rejected by %p (%p)\n",
-                               when, notifier, notifier->notifier_call);
-                        for (; list != &sleep_notifiers; list = list->next) {
-                                notifier = list_entry(list, struct pmu_sleep_notifier, list);
-                                notifier->notifier_call(notifier, fallback);
-                        }
-                        return ret;
-                }
        }
-        return ret;
 }
 /* Wake is broadcast first-to-last */
-static int
+static void broadcast_wake(void)
-broadcast_wake(void)
 {
-        int ret = PBOOK_SLEEP_OK;
        struct list_head *list;
        struct pmu_sleep_notifier *notifier;
@@ -1806,7 +1797,6 @@ broadcast_wake(void)
                notifier = list_entry(list, struct pmu_sleep_notifier, list);
                notifier->notifier_call(notifier, PBOOK_WAKE);
        }
-        return ret;
 }
 /*
@@ -2013,12 +2003,8 @@ pmac_suspend_devices(void)
        pm_prepare_console();
        
-        /* Notify old-style device drivers & userland */
+        /* Notify old-style device drivers */
-        ret = broadcast_sleep(PBOOK_SLEEP_REQUEST, PBOOK_SLEEP_REJECT);
+        broadcast_sleep(PBOOK_SLEEP_REQUEST);
-        if (ret != PBOOK_SLEEP_OK) {
-                printk(KERN_ERR "Sleep rejected by drivers\n");
-                return -EBUSY;
-        }
        /* Sync the disks. */
        /* XXX It would be nice to have some way to ensure that
@@ -2028,12 +2014,7 @@ pmac_suspend_devices(void)
         */
        sys_sync();
-        /* Sleep can fail now. May not be very robust but useful for debugging */
+        broadcast_sleep(PBOOK_SLEEP_NOW);
-        ret = broadcast_sleep(PBOOK_SLEEP_NOW, PBOOK_WAKE);
-        if (ret != PBOOK_SLEEP_OK) {
-                printk(KERN_ERR "Driver sleep failed\n");
-                return -EBUSY;
-        }
        /* Send suspend call to devices, hold the device core's dpm_sem */
        ret = device_suspend(PMSG_SUSPEND);
@@ -2154,7 +2135,7 @@ static int powerbook_sleep_grackle(void)
        int ret;
        struct pci_dev *grackle;
-        grackle = pci_find_slot(0, 0);
+        grackle = pci_get_bus_and_slot(0, 0);
        if (!grackle)
                return -ENODEV;
@@ -2202,6 +2183,8 @@ static int powerbook_sleep_grackle(void)
        pmcr1 &= ~(GRACKLE_PM|GRACKLE_DOZE|GRACKLE_SLEEP|GRACKLE_NAP); 
        pci_write_config_word(grackle, 0x70, pmcr1);
+        pci_dev_put(grackle);
        /* Make sure the PMU is idle */
        pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,0);
        restore_via_state();
diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c
index 3f7967feaf5b..ab4d1b63f63e 100644
--- a/drivers/macintosh/windfarm_lm75_sensor.c
+++ b/drivers/macintosh/windfarm_lm75_sensor.c
@@ -176,7 +176,7 @@ static int wf_lm75_attach(struct i2c_adapter *adapter)
        for (dev = NULL;
             (dev = of_get_next_child(busnode, dev)) != NULL;) {
                const char *loc =
-                        get_property(dev, "hwsensor-location", NULL);
+                        of_get_property(dev, "hwsensor-location", NULL);
                u8 addr;
                /* We must re-match the adapter in order to properly check
diff --git a/drivers/macintosh/windfarm_max6690_sensor.c b/drivers/macintosh/windfarm_max6690_sensor.c
index eae1189d6c41..eaa74afa175b 100644
--- a/drivers/macintosh/windfarm_max6690_sensor.c
+++ b/drivers/macintosh/windfarm_max6690_sensor.c
@@ -134,7 +134,7 @@ static int wf_max6690_attach(struct i2c_adapter *adapter)
                if (!device_is_compatible(dev, "max6690"))
                        continue;
                addr = pmac_i2c_get_dev_addr(dev);
-                loc = get_property(dev, "hwsensor-location", NULL);
+                loc = of_get_property(dev, "hwsensor-location", NULL);
                if (loc == NULL || addr == 0)
                        continue;
                printk("found max6690, loc=%s addr=0x%02x\n", loc, addr);
diff --git a/drivers/macintosh/windfarm_smu_controls.c b/drivers/macintosh/windfarm_smu_controls.c
index 31b750d61206..ff398adc0283 100644
--- a/drivers/macintosh/windfarm_smu_controls.c
+++ b/drivers/macintosh/windfarm_smu_controls.c
@@ -167,7 +167,7 @@ static struct smu_fan_control *smu_fan_create(struct device_node *node,
        if (fct == NULL)
                return NULL;
        fct->ctrl.ops = &smu_fan_ops;
-        l = get_property(node, "location", NULL);
+        l = of_get_property(node, "location", NULL);
        if (l == NULL)
                goto fail;
@@ -224,17 +224,17 @@ static struct smu_fan_control *smu_fan_create(struct device_node *node,
                goto fail;
        /* Get min & max values*/
-        v = get_property(node, "min-value", NULL);
+        v = of_get_property(node, "min-value", NULL);
        if (v == NULL)
                goto fail;
        fct->min = *v;
-        v = get_property(node, "max-value", NULL);
+        v = of_get_property(node, "max-value", NULL);
        if (v == NULL)
                goto fail;
        fct->max = *v;
        /* Get "reg" value */
-        reg = get_property(node, "reg", NULL);
+        reg = of_get_property(node, "reg", NULL);
        if (reg == NULL)
                goto fail;
        fct->reg = *reg;
diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c
index 83f79de7174b..9a6c2cf8fd0e 100644
--- 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);
+                reg = of_get_property(child, "reg", NULL);
-                type = get_property(child, "device_type", NULL);
+                type = of_get_property(child, "device_type", NULL);
-                loc = get_property(child, "location", NULL);
+                loc = of_get_property(child, "location", NULL);
                if (reg == NULL || loc == NULL)
                        continue;
diff --git a/drivers/macintosh/windfarm_smu_sensors.c b/drivers/macintosh/windfarm_smu_sensors.c
index 01b4c50143dd..9c567b93f417 100644
--- a/drivers/macintosh/windfarm_smu_sensors.c
+++ b/drivers/macintosh/windfarm_smu_sensors.c
@@ -204,8 +204,8 @@ static struct smu_ad_sensor *smu_ads_create(struct device_node *node)
        ads = kmalloc(sizeof(struct smu_ad_sensor), GFP_KERNEL);
        if (ads == NULL)
                return NULL;
-        c = get_property(node, "device_type", NULL);
+        c = of_get_property(node, "device_type", NULL);
-        l = get_property(node, "location", NULL);
+        l = of_get_property(node, "location", NULL);
        if (c == NULL || l == NULL)
                goto fail;
@@ -255,7 +255,7 @@ static struct smu_ad_sensor *smu_ads_create(struct device_node *node)
        } else
                goto fail;
-        v = get_property(node, "reg", NULL);
+        v = of_get_property(node, "reg", NULL);
        if (v == NULL)
                goto fail;
        ads->reg = *v;