Skip to content

Commit f64fdde

Browse files
committed
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: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
1 parent ab58a2f commit f64fdde

File tree

7 files changed

+27
-8
lines changed

7 files changed

+27
-8
lines changed

arch/mips/sgi-ip32/crime.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
#include <asm/ip32/crime.h>
1919
#include <asm/ip32/mace.h>
2020

21+
#include "ip32-common.h"
22+
2123
struct sgi_crime __iomem *crime;
2224
struct sgi_mace __iomem *mace;
2325

@@ -39,7 +41,7 @@ void __init crime_init(void)
3941
id, rev, field, (unsigned long) CRIME_BASE);
4042
}
4143

42-
irqreturn_t crime_memerr_intr(unsigned int irq, void *dev_id)
44+
irqreturn_t crime_memerr_intr(int irq, void *dev_id)
4345
{
4446
unsigned long stat, addr;
4547
int fatal = 0;
@@ -90,7 +92,7 @@ irqreturn_t crime_memerr_intr(unsigned int irq, void *dev_id)
9092
return IRQ_HANDLED;
9193
}
9294

93-
irqreturn_t crime_cpuerr_intr(unsigned int irq, void *dev_id)
95+
irqreturn_t crime_cpuerr_intr(int irq, void *dev_id)
9496
{
9597
unsigned long stat = crime->cpu_error_stat & CRIME_CPU_ERROR_MASK;
9698
unsigned long addr = crime->cpu_error_addr & CRIME_CPU_ERROR_ADDR_MASK;

arch/mips/sgi-ip32/ip32-berr.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
#include <asm/ptrace.h>
1919
#include <asm/tlbdebug.h>
2020

21+
#include "ip32-common.h"
22+
2123
static int ip32_be_handler(struct pt_regs *regs, int is_fixup)
2224
{
2325
int data = regs->cp0_cause & 4;

arch/mips/sgi-ip32/ip32-common.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/* SPDX-License-Identifier: GPL-2.0-only */
2+
3+
#ifndef __IP32_COMMON_H
4+
#define __IP32_COMMON_H
5+
6+
#include <linux/init.h>
7+
#include <linux/interrupt.h>
8+
9+
void __init crime_init(void);
10+
irqreturn_t crime_memerr_intr(int irq, void *dev_id);
11+
irqreturn_t crime_cpuerr_intr(int irq, void *dev_id);
12+
void __init ip32_be_init(void);
13+
void ip32_prepare_poweroff(void);
14+
15+
#endif /* __IP32_COMMON_H */

arch/mips/sgi-ip32/ip32-irq.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
#include <asm/ip32/mace.h>
2929
#include <asm/ip32/ip32_ints.h>
3030

31+
#include "ip32-common.h"
32+
3133
/* issue a PIO read to make sure no PIO writes are pending */
3234
static inline void flush_crime_bus(void)
3335
{
@@ -107,10 +109,6 @@ static inline void flush_mace_bus(void)
107109
* is quite different anyway.
108110
*/
109111

110-
/* Some initial interrupts to set up */
111-
extern irqreturn_t crime_memerr_intr(int irq, void *dev_id);
112-
extern irqreturn_t crime_cpuerr_intr(int irq, void *dev_id);
113-
114112
/*
115113
* This is for pure CRIME interrupts - ie not MACE. The advantage?
116114
* We get to split the register in half and do faster lookups.

arch/mips/sgi-ip32/ip32-memory.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <asm/ip32/crime.h>
1616
#include <asm/bootinfo.h>
1717
#include <asm/page.h>
18+
#include <asm/sgialib.h>
1819

1920
extern void crime_init(void);
2021

arch/mips/sgi-ip32/ip32-reset.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
#include <asm/ip32/crime.h>
3030
#include <asm/ip32/ip32_ints.h>
3131

32+
#include "ip32-common.h"
33+
3234
#define POWERDOWN_TIMEOUT 120
3335
/*
3436
* Blink frequency during reboot grace period and when panicked.

arch/mips/sgi-ip32/ip32-setup.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
#include <asm/ip32/mace.h>
2727
#include <asm/ip32/ip32_ints.h>
2828

29-
extern void ip32_be_init(void);
30-
extern void crime_init(void);
29+
#include "ip32-common.h"
3130

3231
#ifdef CONFIG_SGI_O2MACE_ETH
3332
/*

0 commit comments

Comments
 (0)