[PATCH] Notifier chain update: API changes

[linux-2.6-microblaze.git] / drivers / firmware / dcdbas.c

diff --git a/drivers/firmware/dcdbas.c b/drivers/firmware/dcdbas.c
index 3a4e5c5..339f405 100644 (file)
--- a/drivers/firmware/dcdbas.c
+++ b/drivers/firmware/dcdbas.c
@@ -33,6 +33,7 @@
 #include <linux/spinlock.h>
 #include <linux/string.h>
 #include <linux/types.h>
+#include <linux/mutex.h>
 #include <asm/io.h>
 #include <asm/semaphore.h>
 
@@ -48,7 +49,7 @@ static u8 *smi_data_buf;
 static dma_addr_t smi_data_buf_handle;
 static unsigned long smi_data_buf_size;
 static u32 smi_data_buf_phys_addr;
-static DECLARE_MUTEX(smi_data_lock);
+static DEFINE_MUTEX(smi_data_lock);
 
 static unsigned int host_control_action;
 static unsigned int host_control_smi_type;
@@ -139,9 +140,9 @@ static ssize_t smi_data_buf_size_store(struct device *dev,
        buf_size = simple_strtoul(buf, NULL, 10);
 
        /* make sure SMI data buffer is at least buf_size */
-       down(&smi_data_lock);
+       mutex_lock(&smi_data_lock);
        ret = smi_data_buf_realloc(buf_size);
-       up(&smi_data_lock);
+       mutex_unlock(&smi_data_lock);
        if (ret)
                return ret;
 
@@ -154,7 +155,7 @@ static ssize_t smi_data_read(struct kobject *kobj, char *buf, loff_t pos,
        size_t max_read;
        ssize_t ret;
 
-       down(&smi_data_lock);
+       mutex_lock(&smi_data_lock);
 
        if (pos >= smi_data_buf_size) {
                ret = 0;
@@ -165,7 +166,7 @@ static ssize_t smi_data_read(struct kobject *kobj, char *buf, loff_t pos,
        ret = min(max_read, count);
        memcpy(buf, smi_data_buf + pos, ret);
 out:
-       up(&smi_data_lock);
+       mutex_unlock(&smi_data_lock);
        return ret;
 }
 
@@ -174,7 +175,7 @@ static ssize_t smi_data_write(struct kobject *kobj, char *buf, loff_t pos,
 {
        ssize_t ret;
 
-       down(&smi_data_lock);
+       mutex_lock(&smi_data_lock);
 
        ret = smi_data_buf_realloc(pos + count);
        if (ret)
@@ -183,7 +184,7 @@ static ssize_t smi_data_write(struct kobject *kobj, char *buf, loff_t pos,
        memcpy(smi_data_buf + pos, buf, count);
        ret = count;
 out:
-       up(&smi_data_lock);
+       mutex_unlock(&smi_data_lock);
        return ret;
 }
 
@@ -201,9 +202,9 @@ static ssize_t host_control_action_store(struct device *dev,
        ssize_t ret;
 
        /* make sure buffer is available for host control command */
-       down(&smi_data_lock);
+       mutex_lock(&smi_data_lock);
        ret = smi_data_buf_realloc(sizeof(struct apm_cmd));
-       up(&smi_data_lock);
+       mutex_unlock(&smi_data_lock);
        if (ret)
                return ret;
 
@@ -302,7 +303,7 @@ static ssize_t smi_request_store(struct device *dev,
        unsigned long val = simple_strtoul(buf, NULL, 10);
        ssize_t ret;
 
-       down(&smi_data_lock);
+       mutex_lock(&smi_data_lock);
 
        if (smi_data_buf_size < sizeof(struct smi_cmd)) {
                ret = -ENODEV;
@@ -334,7 +335,7 @@ static ssize_t smi_request_store(struct device *dev,
        }
 
 out:
-       up(&smi_data_lock);
+       mutex_unlock(&smi_data_lock);
        return ret;
 }
 
@@ -483,26 +484,15 @@ static void dcdbas_host_control(void)
 static int dcdbas_reboot_notify(struct notifier_block *nb, unsigned long code,
                                void *unused)
 {
-       static unsigned int notify_cnt = 0;
-
        switch (code) {
        case SYS_DOWN:
        case SYS_HALT:
        case SYS_POWER_OFF:
                if (host_control_on_shutdown) {
                        /* firmware is going to perform host control action */
-                       if (++notify_cnt == 2) {
-                               printk(KERN_WARNING
-                                      "Please wait for shutdown "
-                                      "action to complete...\n");
-                               dcdbas_host_control();
-                       }
-                       /*
-                        * register again and initiate the host control
-                        * action on the second notification to allow
-                        * everyone that registered to be notified
-                        */
-                       register_reboot_notifier(nb);
+                       printk(KERN_WARNING "Please wait for shutdown "
+                              "action to complete...\n");
+                       dcdbas_host_control();
                }
                break;
        }
@@ -513,7 +503,7 @@ static int dcdbas_reboot_notify(struct notifier_block *nb, unsigned long code,
 static struct notifier_block dcdbas_reboot_nb = {
        .notifier_call = dcdbas_reboot_notify,
        .next = NULL,
-       .priority = 0
+       .priority = INT_MIN
 };
 
 static DCDBAS_BIN_ATTR_RW(smi_data);