Merge branch 'linux-2.6'

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

diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index f729eeb..adfea3c 100644 (file)
--- 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,
-                               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:
+               blocking_notifier_call_chain(&adb_client_list,
+                       ADB_MSG_POWERDOWN, NULL);
                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,
-                       ADB_MSG_PRE_RESET, NULL);
-       if (nret & NOTIFY_STOP_MASK) {
-               if (adb_controller->autopoll)
-                       adb_controller->autopoll(autopoll_devs);
-               return -EBUSY;
-       }
+       blocking_notifier_call_chain(&adb_client_list,
+               ADB_MSG_PRE_RESET, NULL);
 
        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,
-                       ADB_MSG_POST_RESET, NULL);
-       if (nret & NOTIFY_STOP_MASK)
-               return -EBUSY;
+       blocking_notifier_call_chain(&adb_client_list,
+               ADB_MSG_POST_RESET, NULL);
        
        return ret;
 }