linux 2.6.16.38 w/ vs2.0.3-rc1

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

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