Commit f64fdde9 authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer

MIPS: sgi-ip32: Fix missing prototypes

Fix interrupt function prototypes, move all prototypes into a new
file ip32-common.h and include it where needed.
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parent ab58a2f3
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
#include <asm/ip32/crime.h> #include <asm/ip32/crime.h>
#include <asm/ip32/mace.h> #include <asm/ip32/mace.h>
#include "ip32-common.h"
struct sgi_crime __iomem *crime; struct sgi_crime __iomem *crime;
struct sgi_mace __iomem *mace; struct sgi_mace __iomem *mace;
...@@ -39,7 +41,7 @@ void __init crime_init(void) ...@@ -39,7 +41,7 @@ void __init crime_init(void)
id, rev, field, (unsigned long) CRIME_BASE); id, rev, field, (unsigned long) CRIME_BASE);
} }
irqreturn_t crime_memerr_intr(unsigned int irq, void *dev_id) irqreturn_t crime_memerr_intr(int irq, void *dev_id)
{ {
unsigned long stat, addr; unsigned long stat, addr;
int fatal = 0; int fatal = 0;
...@@ -90,7 +92,7 @@ irqreturn_t crime_memerr_intr(unsigned int irq, void *dev_id) ...@@ -90,7 +92,7 @@ irqreturn_t crime_memerr_intr(unsigned int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
irqreturn_t crime_cpuerr_intr(unsigned int irq, void *dev_id) irqreturn_t crime_cpuerr_intr(int irq, void *dev_id)
{ {
unsigned long stat = crime->cpu_error_stat & CRIME_CPU_ERROR_MASK; unsigned long stat = crime->cpu_error_stat & CRIME_CPU_ERROR_MASK;
unsigned long addr = crime->cpu_error_addr & CRIME_CPU_ERROR_ADDR_MASK; unsigned long addr = crime->cpu_error_addr & CRIME_CPU_ERROR_ADDR_MASK;
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/tlbdebug.h> #include <asm/tlbdebug.h>
#include "ip32-common.h"
static int ip32_be_handler(struct pt_regs *regs, int is_fixup) static int ip32_be_handler(struct pt_regs *regs, int is_fixup)
{ {
int data = regs->cp0_cause & 4; int data = regs->cp0_cause & 4;
......
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef __IP32_COMMON_H
#define __IP32_COMMON_H
#include <linux/init.h>
#include <linux/interrupt.h>
void __init crime_init(void);
irqreturn_t crime_memerr_intr(int irq, void *dev_id);
irqreturn_t crime_cpuerr_intr(int irq, void *dev_id);
void __init ip32_be_init(void);
void ip32_prepare_poweroff(void);
#endif /* __IP32_COMMON_H */
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
#include <asm/ip32/mace.h> #include <asm/ip32/mace.h>
#include <asm/ip32/ip32_ints.h> #include <asm/ip32/ip32_ints.h>
#include "ip32-common.h"
/* issue a PIO read to make sure no PIO writes are pending */ /* issue a PIO read to make sure no PIO writes are pending */
static inline void flush_crime_bus(void) static inline void flush_crime_bus(void)
{ {
...@@ -107,10 +109,6 @@ static inline void flush_mace_bus(void) ...@@ -107,10 +109,6 @@ static inline void flush_mace_bus(void)
* is quite different anyway. * is quite different anyway.
*/ */
/* Some initial interrupts to set up */
extern irqreturn_t crime_memerr_intr(int irq, void *dev_id);
extern irqreturn_t crime_cpuerr_intr(int irq, void *dev_id);
/* /*
* This is for pure CRIME interrupts - ie not MACE. The advantage? * This is for pure CRIME interrupts - ie not MACE. The advantage?
* We get to split the register in half and do faster lookups. * We get to split the register in half and do faster lookups.
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <asm/ip32/crime.h> #include <asm/ip32/crime.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/sgialib.h>
extern void crime_init(void); extern void crime_init(void);
......
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
#include <asm/ip32/crime.h> #include <asm/ip32/crime.h>
#include <asm/ip32/ip32_ints.h> #include <asm/ip32/ip32_ints.h>
#include "ip32-common.h"
#define POWERDOWN_TIMEOUT 120 #define POWERDOWN_TIMEOUT 120
/* /*
* Blink frequency during reboot grace period and when panicked. * Blink frequency during reboot grace period and when panicked.
......
...@@ -26,8 +26,7 @@ ...@@ -26,8 +26,7 @@
#include <asm/ip32/mace.h> #include <asm/ip32/mace.h>
#include <asm/ip32/ip32_ints.h> #include <asm/ip32/ip32_ints.h>
extern void ip32_be_init(void); #include "ip32-common.h"
extern void crime_init(void);
#ifdef CONFIG_SGI_O2MACE_ETH #ifdef CONFIG_SGI_O2MACE_ETH
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment