aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kyle@parisc-linux.org>2006-06-25 16:58:57 +0000
committerKyle McMartin <kyle@hera.kernel.org>2006-06-27 23:28:43 +0000
commit67a061a191017f984a1ef0ff73ae988b9b15f6d3 (patch)
treef7f84d047dbeafe40711386bd6a8a4ae50bd80de
parentec1fdc24c2ae012b078ba0187ceef208e08a3aec (diff)
downloadkernel_samsung_smdk4412-67a061a191017f984a1ef0ff73ae988b9b15f6d3.zip
kernel_samsung_smdk4412-67a061a191017f984a1ef0ff73ae988b9b15f6d3.tar.gz
kernel_samsung_smdk4412-67a061a191017f984a1ef0ff73ae988b9b15f6d3.tar.bz2
[PARISC] Add os_id_to_string helper
Add a helper to asm/pdc.h to translate OS_ID values to strings and use it in the pdc_stable driver. Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
-rw-r--r--drivers/parisc/pdc_stable.c14
-rw-r--r--include/asm-parisc/pdc.h13
2 files changed, 15 insertions, 12 deletions
diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index 97b3458..ea1b7a6 100644
--- 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;
}
diff --git a/include/asm-parisc/pdc.h b/include/asm-parisc/pdc.h
index 33bff61..7a21f10 100644
--- a/include/asm-parisc/pdc.h
+++ b/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