From 4a13c4dbbf07656eb9022fb7c1ee35ca09d5fb98 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@parisc-linux.org>
Date: Sun, 25 Jun 2006 16:58:57 +0000
Subject: [PATCH] --- yaml --- r: 31151 b: refs/heads/master c:
 67a061a191017f984a1ef0ff73ae988b9b15f6d3 h: refs/heads/master i:   31149:
 45fec9f3e4bbb8c4a9042e6daeebadadcc36d5aa   31147:
 f42df1d00be4b5a05b8f591e319dbb68da68c870   31143:
 ed09fe20877b13264abb69b7aefd9ab849a620f9   31135:
 26d7fb04cb632a8e66f29c0fd4350e4994c4c696 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/parisc/pdc_stable.c | 14 ++------------
 trunk/include/asm-parisc/pdc.h    | 13 +++++++++++++
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 9efa72924f36..68cfa6ad2fdf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec1fdc24c2ae012b078ba0187ceef208e08a3aec
+refs/heads/master: 67a061a191017f984a1ef0ff73ae988b9b15f6d3
diff --git a/trunk/drivers/parisc/pdc_stable.c b/trunk/drivers/parisc/pdc_stable.c
index 97b345858043..ea1b7a63598e 100644
--- a/trunk/drivers/parisc/pdc_stable.c
+++ b/trunk/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;
 }
diff --git a/trunk/include/asm-parisc/pdc.h b/trunk/include/asm-parisc/pdc.h
index 33bff615d6e1..7a21f106ade6 100644
--- a/trunk/include/asm-parisc/pdc.h
+++ b/trunk/include/asm-parisc/pdc.h
@@ -284,6 +284,19 @@ typedef struct {
 #define OS_ID_NOVEL		5	/* NOVELL OS		*/
 #define OS_ID_LINUX		6	/* Linux		*/
 
+static inline char * os_id_to_string(u16 os_id) {
+	switch(os_id) {
+	case OS_ID_NONE:	return "No OS";
+	case OS_ID_HPUX:	return "HP-UX";
+	case OS_ID_MPEXL:	return "MPE-iX";
+	case OS_ID_OSF:		return "OSF";
+	case OS_ID_HPRT:	return "HP-RT";
+	case OS_ID_NOVEL:	return "Novell Netware";
+	case OS_ID_LINUX:	return "Linux";
+	default:	return "Unknown";
+	}
+}
+
 
 /* constants for PDC_CHASSIS */
 #define OSTAT_OFF		0