Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81265fd9 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc: fix sparse warnings in irq_32.c 



Fix following sparse warnings:
symbol 'static_irqaction' was not declared. Should it be static?
symbol 'static_irq_count' was not declared. Should it be static?
symbol 'irq_action_lock' was not declared. Should it be static?
symbol 'unexpected_irq' was not declared. Should it be static?
symbol 'handler_irq' was not declared. Should it be static?
returning void-valued expression
returning void-valued expression
returning void-valued expression
symbol 'init_IRQ' was not declared. Should it be static?

Warnings were fixed by addding proper declarations
and fixing return path of a few functions.

There remains several warnings all related to the floppy driver.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7105de84

arch/sparc/include/asm/irq_32.h

+1 −0
Original line number Diff line number Diff line
@@ -12,4 +12,5 @@ 


#define irq_canonicalize(irq)	(irq)



extern void __init init_IRQ(void);

#endif

arch/sparc/kernel/entry.h

+3 −1
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ 
#include <linux/types.h>

#include <linux/init.h>



/* irq */

extern void handler_irq(int irq, struct pt_regs *regs);



#ifdef CONFIG_SPARC32

/* traps */

extern void do_hw_interrupt(struct pt_regs *regs, unsigned long type);
@@ -219,7 +222,6 @@ struct ino_bucket { 
extern struct ino_bucket *ivector_table;

extern unsigned long ivector_table_pa;



extern void handler_irq(int irq, struct pt_regs *regs);

extern void init_irqwork_curcpu(void);

extern void __cpuinit sun4v_register_mondo_queues(int this_cpu);

arch/sparc/kernel/irq_32.c

+4 −3
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include <asm/cacheflush.h>

#include <asm/irq_regs.h>



#include "kernel.h"

#include "irq.h"



#ifdef CONFIG_SMP
@@ -592,19 +593,19 @@ EXPORT_SYMBOL(request_irq); 


void disable_irq_nosync(unsigned int irq)

{

	return __disable_irq(irq);

	__disable_irq(irq);

}

EXPORT_SYMBOL(disable_irq_nosync);



void disable_irq(unsigned int irq)

{

	return __disable_irq(irq);

	__disable_irq(irq);

}

EXPORT_SYMBOL(disable_irq);



void enable_irq(unsigned int irq)

{

	return __enable_irq(irq);

	__enable_irq(irq);

}



EXPORT_SYMBOL(enable_irq);

arch/sparc/kernel/kernel.h

+11 −0
Original line number Diff line number Diff line 
#ifndef __SPARC_KERNEL_H

#define __SPARC_KERNEL_H



#include <linux/interrupt.h>



/* cpu.c */

extern const char *sparc_cpu_type;

extern const char *sparc_fpu_type;
@@ -15,6 +18,14 @@ extern void handle_hw_divzero(struct pt_regs *regs, unsigned long pc, 
                              unsigned long npc, unsigned long psr);

/* muldiv.c */

extern int do_user_muldiv (struct pt_regs *, unsigned long);



/* irq_32.c */

extern struct irqaction static_irqaction[];

extern int static_irq_count;

extern spinlock_t irq_action_lock;



extern void unexpected_irq(int irq, void *dev_id, struct pt_regs * regs);



#else /* CONFIG_SPARC32 */

#endif /* CONFIG_SPARC32 */

#endif /* !(__SPARC_KERNEL_H) */

arch/sparc/kernel/sun4d_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <asm/cacheflush.h>

#include <asm/irq_regs.h>



#include "kernel.h"

#include "irq.h"



/* If you trust current SCSI layer to handle different SCSI IRQs, enable this. I don't trust it... -jj */
@@ -58,7 +59,6 @@ static struct sun4d_timer_regs __iomem *sun4d_timers; 
#define TIMER_IRQ	10



#define MAX_STATIC_ALLOC	4

extern struct irqaction static_irqaction[MAX_STATIC_ALLOC];

extern int static_irq_count;

static unsigned char sbus_tid[32];