Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c
index 820dc52..35b7032 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 {
@@ -835,7 +835,7 @@ static struct pci_save {
 } *pbook_pci_saves;
 static int n_pbook_pci_saves;
 
-static inline void __openfirmware
+static inline void
 pbook_pci_save(void)
 {
        int npci;
@@ -863,7 +863,7 @@ pbook_pci_save(void)
        }
 }
 
-static inline void __openfirmware
+static inline void
 pbook_pci_restore(void)
 {
        u16 cmd;
@@ -902,7 +902,7 @@ pbook_pci_restore(void)
 #define IRQ_ENABLE     ((unsigned int *)0xf3000024)
 #define MEM_CTRL       ((unsigned int *)0xf8000070)
 
-int __openfirmware powerbook_sleep(void)
+int powerbook_sleep(void)
 {
        int ret, i, x;
        static int save_backlight;
@@ -913,7 +913,8 @@ int __openfirmware 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 __openfirmware 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);
@@ -1001,25 +1002,24 @@ int __openfirmware powerbook_sleep(void)
 /*
  * Support for /dev/pmu device
  */
-static int __openfirmware pmu_open(struct inode *inode, struct file *file)
+static int pmu_open(struct inode *inode, struct file *file)
 {
        return 0;
 }
 
-static ssize_t __openfirmware pmu_read(struct file *file, char *buf,
+static ssize_t pmu_read(struct file *file, char *buf,
                        size_t count, loff_t *ppos)
 {
        return 0;
 }
 
-static ssize_t __openfirmware pmu_write(struct file *file, const char *buf,
+static ssize_t pmu_write(struct file *file, const char *buf,
                         size_t count, loff_t *ppos)
 {
        return 0;
 }
 
-/* Note: removed __openfirmware here since it causes link errors */
-static int /*__openfirmware*/ pmu_ioctl(struct inode * inode, struct file *filp,
+static int pmu_ioctl(struct inode * inode, struct file *filp,
                     u_int cmd, u_long arg)
 {
        int error;