V4L/DVB (4608b): i2c deps fix on DVB

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

diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c
index 6f80d76ac17c619b5aea4406140eae094cdf6a7b..35b70323e7e3069e13382e4e44e18c944bd9881a 100644 (file)
--- a/drivers/macintosh/via-pmu68k.c
+++ b/drivers/macintosh/via-pmu68k.c
@@ -102,7 +102,7 @@ static int pmu_kind = PMU_UNKNOWN;
 static int pmu_fully_inited = 0;
 
 int asleep;
-struct notifier_block *sleep_notifier_list;
+BLOCKING_NOTIFIER_HEAD(sleep_notifier_list);
 
 static int pmu_probe(void);
 static int pmu_init(void);
@@ -493,7 +493,7 @@ pmu_queue_request(struct adb_request *req)
                return -EINVAL;
        }
 
-       req->next = 0;
+       req->next = NULL;
        req->sent = 0;
        req->complete = 0;
        local_irq_save(flags);
@@ -717,7 +717,7 @@ pmu_handle_data(unsigned char *data, int len, struct pt_regs *regs)
                                printk(KERN_ERR "PMU: extra ADB reply\n");
                                return;
                        }
-                       req_awaiting_reply = 0;
+                       req_awaiting_reply = NULL;
                        if (len <= 2)
                                req->reply_len = 0;
                        else {
@@ -913,7 +913,8 @@ int powerbook_sleep(void)
        struct adb_request sleep_req;
 
        /* Notify device drivers */
-       ret = notifier_call_chain(&sleep_notifier_list, PBOOK_SLEEP, NULL);
+       ret = blocking_notifier_call_chain(&sleep_notifier_list,
+                       PBOOK_SLEEP, NULL);
        if (ret & NOTIFY_STOP_MASK)
                return -EBUSY;
 
@@ -984,7 +985,7 @@ int powerbook_sleep(void)
                        enable_irq(i);
 
        /* Notify drivers */
-       notifier_call_chain(&sleep_notifier_list, PBOOK_WAKE, NULL);
+       blocking_notifier_call_chain(&sleep_notifier_list, PBOOK_WAKE, NULL);
 
        /* reenable ADB autopoll */
        pmu_adb_autopoll(adb_dev_map);