linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / parisc / kernel / firmware.c

diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c
index 4398d2a..01768a6 100644 (file)
--- a/arch/parisc/kernel/firmware.c
+++ b/arch/parisc/kernel/firmware.c
@@ -11,7 +11,7 @@
  * Copyright 1999 The Puffin Group, (Alex deVries, David Kennedy)
  * Copyright 2003 Grant Grundler <grundler parisc-linux org>
  * Copyright 2003,2004 Ryan Bradetich <rbrad@parisc-linux.org>
- * Copyright 2004,2006 Thibaut VARENE <varenet@parisc-linux.org>
+ * Copyright 2004 Thibaut VARENE <varenet@parisc-linux.org>
  *
  *    This program is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
@@ -252,8 +252,10 @@ int pdc_pat_chassis_send_log(unsigned long state, unsigned long data)
 #endif
 
 /**
- * pdc_chassis_disp - Updates chassis code
+ * pdc_chassis_disp - Updates display
  * @retval: -1 on error, 0 on success
+ *
+ * Works on old PDC only (E class, others?)
  */
 int pdc_chassis_disp(unsigned long disp)
 {
@@ -266,22 +268,6 @@ int pdc_chassis_disp(unsigned long disp)
        return retval;
 }
 
-/**
- * pdc_chassis_warn - Fetches chassis warnings
- * @retval: -1 on error, 0 on success
- */
-int pdc_chassis_warn(unsigned long *warn)
-{
-       int retval = 0;
-
-       spin_lock_irq(&pdc_lock);
-       retval = mem_pdc_call(PDC_CHASSIS, PDC_CHASSIS_WARN, __pa(pdc_result));
-       *warn = pdc_result[0];
-       spin_unlock_irq(&pdc_lock);
-
-       return retval;
-}
-
 /**
  * pdc_coproc_cfg - To identify coprocessors attached to the processor.
  * @pdc_coproc_info: Return buffer address.
@@ -407,9 +393,7 @@ int pdc_model_info(struct pdc_model *model)
  * pdc_model_sysmodel - Get the system model name.
  * @name: A char array of at least 81 characters.
  *
- * Get system model name from PDC ROM (e.g. 9000/715 or 9000/778/B160L).
- * Using OS_ID_HPUX will return the equivalent of the 'modelname' command
- * on HP/UX.
+ * Get system model name from PDC ROM (e.g. 9000/715 or 9000/778/B160L)
  */
 int pdc_model_sysmodel(char *name)
 {
@@ -514,26 +498,6 @@ int pdc_cache_info(struct pdc_cache_info *cache_info)
         return retval;
 }
 
-/**
- * pdc_spaceid_bits - Return whether Space ID hashing is turned on.
- * @space_bits: Should be 0, if not, bad mojo!
- *
- * Returns information about Space ID hashing.
- */
-int pdc_spaceid_bits(unsigned long *space_bits)
-{
-       int retval;
-
-       spin_lock_irq(&pdc_lock);
-       pdc_result[0] = 0;
-       retval = mem_pdc_call(PDC_CACHE, PDC_CACHE_RET_SPID, __pa(pdc_result), 0);
-       convert_to_wide(pdc_result);
-       *space_bits = pdc_result[0];
-       spin_unlock_irq(&pdc_lock);
-
-       return retval;
-}
-
 #ifndef CONFIG_PA20
 /**
  * pdc_btlb_info - Return block TLB information.
@@ -1049,7 +1013,7 @@ void pdc_iodc_putc(unsigned char c)
         static int __attribute__((aligned(8)))   iodc_retbuf[32];
         static char __attribute__((aligned(64))) iodc_dbuf[4096];
         unsigned int n;
-       unsigned int flags;
+       unsigned long flags;
 
         switch (c) {
         case '\n':
@@ -1088,7 +1052,8 @@ void pdc_iodc_putc(unsigned char c)
  */
 void pdc_iodc_outc(unsigned char c)
 {
-       unsigned int n, flags;
+       unsigned int n;
+       unsigned long flags;
 
        /* fill buffer with one caracter and print it */
         static int __attribute__((aligned(8)))   iodc_retbuf[32];
@@ -1113,7 +1078,7 @@ void pdc_iodc_outc(unsigned char c)
  */
 int pdc_iodc_getc(void)
 {
-       unsigned int flags;
+       unsigned long flags;
         static int __attribute__((aligned(8)))   iodc_retbuf[32];
         static char __attribute__((aligned(64))) iodc_dbuf[4096];
        int ch;