[PATCH] ia64: mca.c cleanup - Mark variables and functions static where possible

diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index fca5f43fb376e845e581e7913d1dc4edf6b49ac9..2bedd10bcc72215ba14363a3a5bad501e30bf4c5 100644 (file)
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -44,6 +44,7 @@
  * 2004-02-01 Keith Owens <kaos@sgi.com>
  *            Avoid deadlock when using printk() for MCA and INIT records.
  *            Delete all record printing code, moved to salinfo_decode in user space.
+ *            Mark variables and functions static where possible.
  */
 #include <linux/config.h>
 #include <linux/types.h>
@@ -79,7 +80,7 @@ typedef struct ia64_fptr {
        unsigned long gp;
 } ia64_fptr_t;
 
-ia64_mc_info_t                 ia64_mc_info;
+static ia64_mc_info_t          ia64_mc_info;
 ia64_mca_sal_to_os_state_t     ia64_sal_to_os_handoff_state;
 ia64_mca_os_to_sal_state_t     ia64_os_to_sal_handoff_state;
 u64                            ia64_mca_proc_state_dump[512];
@@ -93,6 +94,12 @@ static void                  ia64_mca_wakeup_ipi_wait(void);
 static void                    ia64_mca_wakeup(int cpu);
 static void                    ia64_mca_wakeup_all(void);
 static void                    ia64_log_init(int);
+static irqreturn_t             ia64_mca_rendez_int_handler(int,void *,struct pt_regs *);
+static irqreturn_t             ia64_mca_wakeup_int_handler(int,void *,struct pt_regs *);
+static irqreturn_t             ia64_mca_cmc_int_handler(int,void *,struct pt_regs *);
+static irqreturn_t             ia64_mca_cpe_int_handler(int, void *, struct pt_regs *);
+static irqreturn_t             ia64_mca_cmc_int_caller(int,void *,struct pt_regs *);
+static irqreturn_t             ia64_mca_cpe_int_caller(int,void *,struct pt_regs *);
 extern void                    ia64_monarch_init_handler (void);
 extern void                    ia64_slave_init_handler (void);
 static u64                     ia64_log_get(int sal_info_type, u8 **buffer);
@@ -199,13 +206,13 @@ ia64_mca_log_sal_error_record(int sal_info_type, int called_from_init)
  * platform dependent error handling
  */
 #ifndef PLATFORM_MCA_HANDLERS
-void
+static void
 mca_handler_platform (void)
 {
 
 }
 
-irqreturn_t
+static irqreturn_t
 ia64_mca_cpe_int_handler (int cpe_irq, void *arg, struct pt_regs *ptregs)
 {
        IA64_MCA_DEBUG("ia64_mca_cpe_int_handler: received interrupt. CPU:%d vector = %#x\n",
@@ -357,7 +364,7 @@ fetch_min_state (pal_min_state_area_t *ms, struct pt_regs *pt, struct switch_sta
        PUT_NAT_BIT(sw->caller_unat, &pt->r30); PUT_NAT_BIT(sw->caller_unat, &pt->r31);
 }
 
-void
+static void
 init_handler_platform (pal_min_state_area_t *ms,
                       struct pt_regs *pt, struct switch_stack *sw)
 {
@@ -415,7 +422,7 @@ init_handler_platform (pal_min_state_area_t *ms,
  *  Outputs
  *      None
  */
-void
+static void
 ia64_mca_init_platform (void)
 {
 
@@ -521,7 +528,7 @@ ia64_mca_cmc_vector_setup (void)
  * Outputs
  *     None
  */
-void
+static void
 ia64_mca_cmc_vector_disable (void *dummy)
 {
        cmcv_reg_t      cmcv;
@@ -548,7 +555,7 @@ ia64_mca_cmc_vector_disable (void *dummy)
  * Outputs
  *     None
  */
-void
+static void
 ia64_mca_cmc_vector_enable (void *dummy)
 {
        cmcv_reg_t      cmcv;
@@ -782,7 +789,7 @@ ia64_mca_init(void)
  *  Inputs  :   None
  *  Outputs :   None
  */
-void
+static void
 ia64_mca_wakeup_ipi_wait(void)
 {
        int     irr_num = (IA64_MCA_WAKEUP_VECTOR >> 6);
@@ -816,7 +823,7 @@ ia64_mca_wakeup_ipi_wait(void)
  *  Inputs  :   cpuid
  *  Outputs :   None
  */
-void
+static void
 ia64_mca_wakeup(int cpu)
 {
        platform_send_ipi(cpu, IA64_MCA_WAKEUP_VECTOR, IA64_IPI_DM_INT, 0);
@@ -832,7 +839,7 @@ ia64_mca_wakeup(int cpu)
  *  Inputs  :   None
  *  Outputs :   None
  */
-void
+static void
 ia64_mca_wakeup_all(void)
 {
        int cpu;
@@ -857,7 +864,7 @@ ia64_mca_wakeup_all(void)
  *  Inputs  :   None
  *  Outputs :   None
  */
-irqreturn_t
+static irqreturn_t
 ia64_mca_rendez_int_handler(int rendez_irq, void *arg, struct pt_regs *ptregs)
 {
        unsigned long flags;
@@ -899,7 +906,7 @@ ia64_mca_rendez_int_handler(int rendez_irq, void *arg, struct pt_regs *ptregs)
  *  Outputs :   None
  *
  */
-irqreturn_t
+static irqreturn_t
 ia64_mca_wakeup_int_handler(int wakeup_irq, void *arg, struct pt_regs *ptregs)
 {
        return IRQ_HANDLED;
@@ -919,7 +926,7 @@ ia64_mca_wakeup_int_handler(int wakeup_irq, void *arg, struct pt_regs *ptregs)
  *  Outputs :   None
  */
 
-void
+static void
 ia64_return_to_sal_check(void)
 {
        pal_processor_state_info_t *psp = (pal_processor_state_info_t *)
@@ -1002,7 +1009,7 @@ static DECLARE_WORK(cmc_enable_work, ia64_mca_cmc_vector_enable_keventd, NULL);
  * Outputs
  *     None
  */
-irqreturn_t
+static irqreturn_t
 ia64_mca_cmc_int_handler(int cmc_irq, void *arg, struct pt_regs *ptregs)
 {
        static unsigned long    cmc_history[CMC_HISTORY_LENGTH];
@@ -1105,7 +1112,7 @@ static ia64_state_log_t ia64_state_log[IA64_MAX_LOG_TYPES];
  * Outputs
  *     handled
  */
-irqreturn_t
+static irqreturn_t
 ia64_mca_cmc_int_caller(int cpe_irq, void *arg, struct pt_regs *ptregs)
 {
        static int start_count = -1;
@@ -1172,7 +1179,7 @@ ia64_mca_cmc_poll (unsigned long dummy)
  * Outputs
  *     handled
  */
-irqreturn_t
+static irqreturn_t
 ia64_mca_cpe_int_caller(int cpe_irq, void *arg, struct pt_regs *ptregs)
 {
        static int start_count = -1;
@@ -1298,7 +1305,7 @@ ia64_init_handler (struct pt_regs *pt, struct switch_stack *sw)
  * Inputs   :   info_type   (SAL_INFO_TYPE_{MCA,INIT,CMC,CPE})
  * Outputs     :       None
  */
-void
+static void
 ia64_log_init(int sal_info_type)
 {
        u64     max_size = 0;

diff --git a/include/asm-ia64/mca.h b/include/asm-ia64/mca.h
index 0ef3f96a75f6e380d483a2af8bd39ae4a4ea89e3..5e56fe0975856e5f635d7e9d5d913429aa5ec37f 100644 (file)
--- a/include/asm-ia64/mca.h
+++ b/include/asm-ia64/mca.h
@@ -2,7 +2,7 @@
  * File:       mca.h
  * Purpose:    Machine check handling specific defines
  *
- * Copyright (C) 1999 Silicon Graphics, Inc.
+ * Copyright (C) 1999, 2004 Silicon Graphics, Inc.
  * Copyright (C) Vijay Chander (vijay@engr.sgi.com)
  * Copyright (C) Srinivasa Thirumalachar (sprasad@engr.sgi.com)
  */
@@ -142,12 +142,6 @@ extern void ia64_os_mca_dispatch_end(void);
 extern void ia64_mca_ucmc_handler(void);
 extern void ia64_monarch_init_handler(void);
 extern void ia64_slave_init_handler(void);
-extern irqreturn_t ia64_mca_rendez_int_handler(int,void *,struct pt_regs *);
-extern irqreturn_t ia64_mca_wakeup_int_handler(int,void *,struct pt_regs *);
-extern irqreturn_t ia64_mca_cmc_int_handler(int,void *,struct pt_regs *);
-extern irqreturn_t ia64_mca_cmc_int_caller(int,void *,struct pt_regs *);
-extern irqreturn_t ia64_mca_cpe_int_handler(int,void *,struct pt_regs *);
-extern irqreturn_t ia64_mca_cpe_int_caller(int,void *,struct pt_regs *);
 extern void ia64_mca_cmc_vector_setup(void);
 extern int  ia64_mca_check_errors(void);