[PARISC] Convert soft power switch driver to kthread

[safe/jmp/linux-2.6] / drivers / parisc / pdc_stable.c

diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index 4b991d5..ea1b7a6 100644 (file)
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -622,22 +622,12 @@ static ssize_t
 pdcs_osid_read(struct subsystem *entry, char *buf)
 {
        char *out = buf;
-       char *tmpstr = NULL;
 
        if (!entry || !buf)
                return -EINVAL;
 
-       switch (pdcs_osid) {
-               case 0x0000:    tmpstr = "No OS-dependent data"; break;
-               case 0x0001:    tmpstr = "HP-UX dependent data"; break;
-               case 0x0002:    tmpstr = "MPE-iX dependent data"; break;
-               case 0x0003:    tmpstr = "OSF dependent data"; break;
-               case 0x0004:    tmpstr = "HP-RT dependent data"; break;
-               case 0x0005:    tmpstr = "Novell Netware dependent data"; break;
-               case 0x0006:    tmpstr = "Linux dependent data"; break;
-               default:        tmpstr = "Unknown"; break;
-       }
-       out += sprintf(out, "%s (0x%.4x)\n", tmpstr, pdcs_osid);
+       out += sprintf(out, "%s dependent data (0x%.4x)\n",
+               os_id_to_string(pdcs_osid), pdcs_osid);
 
        return out - buf;
 }
@@ -884,7 +874,7 @@ pdcs_osdep1_write(struct subsystem *entry, const char *buf, size_t count)
        if (!entry || !buf || !count)
                return -EINVAL;
 
-       if (unlikely(pdcs_osid != 0x0006))
+       if (unlikely(pdcs_osid != OS_ID_LINUX))
                return -EPERM;
 
        if (count > 16)
@@ -926,7 +916,7 @@ pdcs_osdep2_write(struct subsystem *entry, const char *buf, size_t count)
        if (unlikely(pdcs_size <= 224))
                return -ENOSYS;
 
-       if (unlikely(pdcs_osid != 0x0006))
+       if (unlikely(pdcs_osid != OS_ID_LINUX))
                return -EPERM;
 
        size = pdcs_size - 224;