Pull error-inject into release branch

[linux-2.6-omap-h63xx.git] / drivers / parisc / pdc_stable.c

diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index a1094210cd1f26ba27a941fb7ce3be5ae4fada16..ea1b7a63598e1c4fc87ee001a66293cb2fe92b37 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"; break;
-               case 0x0001:    tmpstr = "HP-UX"; break;
-               case 0x0002:    tmpstr = "MPE-iX"; break;
-               case 0x0003:    tmpstr = "OSF"; break;
-               case 0x0004:    tmpstr = "HP-RT"; break;
-               case 0x0005:    tmpstr = "Novell Netware"; break;
-               case 0x0006:    tmpstr = "Linux"; break;
-               default:        tmpstr = "Unknown"; break;
-       }
-       out += sprintf(out, "%s dependent data (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;