Commit f310f8dd authored by Helge Deller's avatar Helge Deller
Browse files

parisc: Move init function declarations into header file 



Clean up the code to not have external function declarations
inside the C source files. Reduces warnings when compiled with W=1.

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent c8080024

arch/parisc/include/asm/processor.h

+32 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#ifndef __ASSEMBLY__

#include <linux/threads.h>

#include <linux/irqreturn.h>



#include <asm/assembly.h>

#include <asm/prefetch.h>
@@ -292,6 +293,37 @@ extern void toc_handler(void); 
extern unsigned int toc_handler_size;

extern unsigned int toc_handler_csum;



/* called from assembly code: */

extern void start_parisc(void);

extern void smp_callin(unsigned long);

extern void sys_rt_sigreturn(struct pt_regs *, int);

extern void do_notify_resume(struct pt_regs *, long);

extern long do_syscall_trace_enter(struct pt_regs *);

extern void do_syscall_trace_exit(struct pt_regs *);



/* CPU startup and info */

struct seq_file;

extern void early_trap_init(void);

extern void collect_boot_cpu_data(void);

extern int show_cpuinfo (struct seq_file *m, void *v);



/* driver code in driver/parisc */

extern void gsc_init(void);

extern void processor_init(void);

extern void ccio_init(void);

extern void hppb_init(void);

extern void dino_init(void);

extern void iosapic_init(void);

extern void lba_init(void);

extern void sba_init(void);

extern void parisc_eisa_init(void);

struct parisc_device;

struct resource;

extern void sba_distributed_lmmio(struct parisc_device *, struct resource *);

extern void sba_directed_lmmio(struct parisc_device *, struct resource *);

extern void lba_set_iregs(struct parisc_device *lba, u32 ibase, u32 imask);

extern void ccio_cujo20_fixup(struct parisc_device *dev, u32 iovp);



#endif /* __ASSEMBLY__ */



#endif /* __ASM_PARISC_PROCESSOR_H */

arch/parisc/kernel/setup.c

+3 −20
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct proc_dir_entry * proc_runway_root __read_mostly = NULL; 
struct proc_dir_entry * proc_gsc_root __read_mostly = NULL;

struct proc_dir_entry * proc_mckinley_root __read_mostly = NULL;



void __init setup_cmdline(char **cmdline_p)

static void __init setup_cmdline(char **cmdline_p)

{

	extern unsigned int boot_args[];

	char *p;
@@ -86,7 +86,7 @@ void __init setup_cmdline(char **cmdline_p) 
}



#ifdef CONFIG_PA11

void __init dma_ops_init(void)

static void __init dma_ops_init(void)

{

	switch (boot_cpu_data.cpu_type) {

	case pcx:
@@ -106,8 +106,6 @@ void __init dma_ops_init(void) 
}

#endif



extern void collect_boot_cpu_data(void);



void __init setup_arch(char **cmdline_p)

{

#ifdef CONFIG_64BIT
@@ -167,10 +165,7 @@ void __init setup_arch(char **cmdline_p) 


/*

 * Display CPU info for all CPUs.

 * for parisc this is in processor.c

 */

extern int show_cpuinfo (struct seq_file *m, void *v);



static void *

c_start (struct seq_file *m, loff_t *pos)

{
@@ -295,16 +290,6 @@ static int __init parisc_init_resources(void) 
	return 0;

}



extern void gsc_init(void);

extern void processor_init(void);

extern void ccio_init(void);

extern void hppb_init(void);

extern void dino_init(void);

extern void iosapic_init(void);

extern void lba_init(void);

extern void sba_init(void);

extern void eisa_init(void);



static int __init parisc_init(void)

{

	u32 osid = (OS_ID_LINUX << 16);
@@ -370,7 +355,7 @@ static int __init parisc_init(void) 
	gsc_init();

#endif

#ifdef CONFIG_EISA

	eisa_init();

	parisc_eisa_init();

#endif



#if defined(CONFIG_HPPB)
@@ -391,8 +376,6 @@ arch_initcall(parisc_init); 


void __init start_parisc(void)

{

	extern void early_trap_init(void);



	int ret, cpunum;

	struct pdc_coproc_cfg coproc_cfg;

drivers/parisc/dino.c

+0 −2
Original line number Diff line number Diff line
@@ -924,8 +924,6 @@ static const char cujo_vers[][4] = { 
	"2.0"

};



void ccio_cujo20_fixup(struct parisc_device *dev, u32 iovp);



/*

** Determine if dino should claim this chip (return 0) or not (return 1).

** If so, initialize the chip appropriately (card-mode vs bridge mode).

drivers/parisc/eisa.c

+1 −1
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ static struct parisc_driver eisa_driver __refdata = { 
	.probe =	eisa_probe,

};



void __init eisa_init(void)

void __init parisc_eisa_init(void)

{

	register_parisc_driver(&eisa_driver);

}

drivers/parisc/lba_pci.c

+0 −4
Original line number Diff line number Diff line
@@ -1164,10 +1164,6 @@ lba_pat_resources(struct parisc_device *pa_dev, struct lba_device *lba_dev) 
#endif	/* CONFIG_64BIT */





extern void sba_distributed_lmmio(struct parisc_device *, struct resource *);

extern void sba_directed_lmmio(struct parisc_device *, struct resource *);





static void

lba_legacy_resources(struct parisc_device *pa_dev, struct lba_device *lba_dev)

{