Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[linux-2.6-omap-h63xx.git] / drivers / macintosh / adb.c

diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index c0dc1e3fa58bfa1f28074f136de8bcfa8d269cca..259fd8973ce94c076064a2323a38b467d325d9c4 100644 (file)
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -42,6 +42,7 @@
 #include <asm/semaphore.h>
 #ifdef CONFIG_PPC
 #include <asm/prom.h>
+#include <asm/machdep.h>
 #endif
 
 
@@ -80,7 +81,7 @@ static struct adb_driver *adb_driver_list[] = {
 static struct class *adb_dev_class;
 
 struct adb_driver *adb_controller;
-struct notifier_block *adb_client_list = NULL;
+BLOCKING_NOTIFIER_HEAD(adb_client_list);
 static int adb_got_sleep;
 static int adb_inited;
 static pid_t adb_probe_task_pid;
@@ -294,7 +295,7 @@ int __init adb_init(void)
        int i;
 
 #ifdef CONFIG_PPC32
-       if ( (_machine != _MACH_chrp) && (_machine != _MACH_Pmac) )
+       if (!machine_is(chrp) && !machine_is(powermac))
                return 0;
 #endif
 #ifdef CONFIG_MAC
@@ -354,7 +355,8 @@ adb_notify_sleep(struct pmu_sleep_notifier *self, int when)
                /* Stop autopoll */
                if (adb_controller->autopoll)
                        adb_controller->autopoll(0);
-               ret = notifier_call_chain(&adb_client_list, ADB_MSG_POWERDOWN, NULL);
+               ret = blocking_notifier_call_chain(&adb_client_list,
+                               ADB_MSG_POWERDOWN, NULL);
                if (ret & NOTIFY_STOP_MASK) {
                        up(&adb_probe_mutex);
                        return PBOOK_SLEEP_REFUSE;
@@ -391,7 +393,8 @@ do_adb_reset_bus(void)
        if (adb_controller->autopoll)
                adb_controller->autopoll(0);
 
-       nret = notifier_call_chain(&adb_client_list, ADB_MSG_PRE_RESET, NULL);
+       nret = blocking_notifier_call_chain(&adb_client_list,
+                       ADB_MSG_PRE_RESET, NULL);
        if (nret & NOTIFY_STOP_MASK) {
                if (adb_controller->autopoll)
                        adb_controller->autopoll(autopoll_devs);
@@ -426,7 +429,8 @@ do_adb_reset_bus(void)
        }
        up(&adb_handler_sem);
 
-       nret = notifier_call_chain(&adb_client_list, ADB_MSG_POST_RESET, NULL);
+       nret = blocking_notifier_call_chain(&adb_client_list,
+                       ADB_MSG_POST_RESET, NULL);
        if (nret & NOTIFY_STOP_MASK)
                return -EBUSY;
        
@@ -905,5 +909,5 @@ adbdev_init(void)
        adb_dev_class = class_create(THIS_MODULE, "adb");
        if (IS_ERR(adb_dev_class))
                return;
-       class_device_create(adb_dev_class, MKDEV(ADB_MAJOR, 0), NULL, "adb");
+       class_device_create(adb_dev_class, NULL, MKDEV(ADB_MAJOR, 0), NULL, "adb");
 }