sparc: drop use of extern for prototypes in arch/sparc/*

Drop the remaining uses of extern for prototypes in .h files
in the sparc specific part of the kernel tree.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

arch/sparc/kernel/cpumap.h

@@ -2,8 +2,8 @@
 #define _CPUMAP_H
 
 #ifdef CONFIG_SMP
-extern void cpu_map_rebuild(void);
-extern int  map_to_cpu(unsigned int index);
+void cpu_map_rebuild(void);
+int map_to_cpu(unsigned int index);
 #define cpu_map_init() cpu_map_rebuild()
 #else
 #define cpu_map_init() do {} while (0)

arch/sparc/kernel/iommu_common.h

@@ -48,11 +48,11 @@ static inline int is_span_boundary(unsigned long entry,
 	return iommu_is_span_boundary(entry, nr, shift, boundary_size);
 }
 
-extern unsigned long iommu_range_alloc(struct device *dev,
+unsigned long iommu_range_alloc(struct device *dev,
 				struct iommu *iommu,
 				unsigned long npages,
 				unsigned long *handle);
-extern void iommu_range_free(struct iommu *iommu,
+void iommu_range_free(struct iommu *iommu,
 		      dma_addr_t dma_addr,
 		      unsigned long npages);
 

arch/sparc/kernel/irq.h

@@ -96,6 +96,6 @@ void sun4d_handler_irq(unsigned int pil, struct pt_regs *regs);
 /* All SUN4D IPIs are sent on this IRQ, may be shared with hard IRQs */
 #define SUN4D_IPI_IRQ 13
 
-extern void sun4d_ipi_interrupt(void);
+void sun4d_ipi_interrupt(void);
 
 #endif

arch/sparc/kernel/kernel.h

@@ -15,7 +15,7 @@ extern int ncpus_probed;
 #ifdef CONFIG_SPARC64
 /* setup_64.c */
 struct seq_file;
-extern void cpucap_info(struct seq_file *);
+void cpucap_info(struct seq_file *);
 
 static inline unsigned long kimage_addr_to_ra(const char *p)
 {
@@ -31,23 +31,23 @@ struct linux_romvec;
 void sparc32_start_kernel(struct linux_romvec *rp);
 
 /* cpu.c */
-extern void cpu_probe(void);
+void cpu_probe(void);
 
 /* traps_32.c */
-extern void handle_hw_divzero(struct pt_regs *regs, unsigned long pc,
+void handle_hw_divzero(struct pt_regs *regs, unsigned long pc,
                        unsigned long npc, unsigned long psr);
 /* 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);
-extern void init_IRQ(void);
+void unexpected_irq(int irq, void *dev_id, struct pt_regs * regs);
+void init_IRQ(void);
 
 /* sun4m_irq.c */
-extern void sun4m_init_IRQ(void);
-extern void sun4m_unmask_profile_irq(void);
-extern void sun4m_clear_profile_irq(int cpu);
+void sun4m_init_IRQ(void);
+void sun4m_unmask_profile_irq(void);
+void sun4m_clear_profile_irq(int cpu);
 
 /* sun4m_smp.c */
 void sun4m_cpu_pre_starting(void *arg);
@@ -61,14 +61,14 @@ void smp4m_percpu_timer_interrupt(struct pt_regs *regs);
 /* sun4d_irq.c */
 extern spinlock_t sun4d_imsk_lock;
 
-extern void sun4d_init_IRQ(void);
-extern int sun4d_request_irq(unsigned int irq,
+void sun4d_init_IRQ(void);
+int sun4d_request_irq(unsigned int irq,
                       irq_handler_t handler,
                       unsigned long irqflags,
                       const char *devname, void *dev_id);
-extern int show_sun4d_interrupts(struct seq_file *, void *);
-extern void sun4d_distribute_irqs(void);
-extern void sun4d_free_irq(unsigned int irq, void *dev_id);
+int show_sun4d_interrupts(struct seq_file *, void *);
+void sun4d_distribute_irqs(void);
+void sun4d_free_irq(unsigned int irq, void *dev_id);
 
 /* sun4d_smp.c */
 void sun4d_cpu_pre_starting(void *arg);
@@ -102,7 +102,7 @@ extern unsigned int real_irq_entry[];
 extern unsigned int smp4d_ticker[];
 extern unsigned int patchme_maybe_smp_msg[];
 
-extern void floppy_hardint(void);
+void floppy_hardint(void);
 
 /* trampoline_32.S */
 extern unsigned long sun4m_cpu_startup;

arch/sparc/kernel/pci_impl.h

@@ -48,7 +48,7 @@ struct sparc64_msiq_ops {
 			      unsigned long devino);
 };
 
-extern void sparc64_pbm_msi_init(struct pci_pbm_info *pbm,
+void sparc64_pbm_msi_init(struct pci_pbm_info *pbm,
 			  const struct sparc64_msiq_ops *ops);
 
 struct sparc64_msiq_cookie {
@@ -158,23 +158,23 @@ extern struct pci_pbm_info *pci_pbm_root;
 extern int pci_num_pbms;
 
 /* PCI bus scanning and fixup support. */
-extern void pci_get_pbm_props(struct pci_pbm_info *pbm);
-extern struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,
+void pci_get_pbm_props(struct pci_pbm_info *pbm);
+struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,
 				 struct device *parent);
-extern void pci_determine_mem_io_space(struct pci_pbm_info *pbm);
+void pci_determine_mem_io_space(struct pci_pbm_info *pbm);
 
 /* Error reporting support. */
-extern void pci_scan_for_target_abort(struct pci_pbm_info *, struct pci_bus *);
-extern void pci_scan_for_master_abort(struct pci_pbm_info *, struct pci_bus *);
-extern void pci_scan_for_parity_error(struct pci_pbm_info *, struct pci_bus *);
+void pci_scan_for_target_abort(struct pci_pbm_info *, struct pci_bus *);
+void pci_scan_for_master_abort(struct pci_pbm_info *, struct pci_bus *);
+void pci_scan_for_parity_error(struct pci_pbm_info *, struct pci_bus *);
 
 /* Configuration space access. */
-extern void pci_config_read8(u8 *addr, u8 *ret);
-extern void pci_config_read16(u16 *addr, u16 *ret);
-extern void pci_config_read32(u32 *addr, u32 *ret);
-extern void pci_config_write8(u8 *addr, u8 val);
-extern void pci_config_write16(u16 *addr, u16 val);
-extern void pci_config_write32(u32 *addr, u32 val);
+void pci_config_read8(u8 *addr, u8 *ret);
+void pci_config_read16(u16 *addr, u16 *ret);
+void pci_config_read32(u32 *addr, u32 *ret);
+void pci_config_write8(u8 *addr, u8 val);
+void pci_config_write16(u16 *addr, u16 val);
+void pci_config_write32(u32 *addr, u32 val);
 
 extern struct pci_ops sun4u_pci_ops;
 extern struct pci_ops sun4v_pci_ops;

arch/sparc/kernel/pci_sun4v.h

@@ -6,86 +6,86 @@
 #ifndef _PCI_SUN4V_H
 #define _PCI_SUN4V_H
 
-extern long pci_sun4v_iommu_map(unsigned long devhandle,
+long pci_sun4v_iommu_map(unsigned long devhandle,
 			 unsigned long tsbid,
 			 unsigned long num_ttes,
 			 unsigned long io_attributes,
 			 unsigned long io_page_list_pa);
-extern unsigned long pci_sun4v_iommu_demap(unsigned long devhandle,
+unsigned long pci_sun4v_iommu_demap(unsigned long devhandle,
 				    unsigned long tsbid,
 				    unsigned long num_ttes);
-extern unsigned long pci_sun4v_iommu_getmap(unsigned long devhandle,
+unsigned long pci_sun4v_iommu_getmap(unsigned long devhandle,
 				     unsigned long tsbid,
 				     unsigned long *io_attributes,
 				     unsigned long *real_address);
-extern unsigned long pci_sun4v_config_get(unsigned long devhandle,
+unsigned long pci_sun4v_config_get(unsigned long devhandle,
 				   unsigned long pci_device,
 				   unsigned long config_offset,
 				   unsigned long size);
-extern int pci_sun4v_config_put(unsigned long devhandle,
+int pci_sun4v_config_put(unsigned long devhandle,
 			 unsigned long pci_device,
 			 unsigned long config_offset,
 			 unsigned long size,
 			 unsigned long data);
 
-extern unsigned long pci_sun4v_msiq_conf(unsigned long devhandle,
+unsigned long pci_sun4v_msiq_conf(unsigned long devhandle,
 					 unsigned long msiqid,
 					 unsigned long msiq_paddr,
 					 unsigned long num_entries);
-extern unsigned long pci_sun4v_msiq_info(unsigned long devhandle,
+unsigned long pci_sun4v_msiq_info(unsigned long devhandle,
 				  unsigned long msiqid,
 				  unsigned long *msiq_paddr,
 				  unsigned long *num_entries);
-extern unsigned long pci_sun4v_msiq_getvalid(unsigned long devhandle,
+unsigned long pci_sun4v_msiq_getvalid(unsigned long devhandle,
 				      unsigned long msiqid,
 				      unsigned long *valid);
-extern unsigned long pci_sun4v_msiq_setvalid(unsigned long devhandle,
+unsigned long pci_sun4v_msiq_setvalid(unsigned long devhandle,
 				      unsigned long msiqid,
 				      unsigned long valid);
-extern unsigned long pci_sun4v_msiq_getstate(unsigned long devhandle,
+unsigned long pci_sun4v_msiq_getstate(unsigned long devhandle,
 				      unsigned long msiqid,
 				      unsigned long *state);
-extern unsigned long pci_sun4v_msiq_setstate(unsigned long devhandle,
+unsigned long pci_sun4v_msiq_setstate(unsigned long devhandle,
 				      unsigned long msiqid,
 				      unsigned long state);
-extern unsigned long pci_sun4v_msiq_gethead(unsigned long devhandle,
+unsigned long pci_sun4v_msiq_gethead(unsigned long devhandle,
 				     unsigned long msiqid,
 				     unsigned long *head);
-extern unsigned long pci_sun4v_msiq_sethead(unsigned long devhandle,
+unsigned long pci_sun4v_msiq_sethead(unsigned long devhandle,
 				     unsigned long msiqid,
 				     unsigned long head);
-extern unsigned long pci_sun4v_msiq_gettail(unsigned long devhandle,
+unsigned long pci_sun4v_msiq_gettail(unsigned long devhandle,
 				      unsigned long msiqid,
 				      unsigned long *head);
-extern unsigned long pci_sun4v_msi_getvalid(unsigned long devhandle,
+unsigned long pci_sun4v_msi_getvalid(unsigned long devhandle,
 				     unsigned long msinum,
 				     unsigned long *valid);
-extern unsigned long pci_sun4v_msi_setvalid(unsigned long devhandle,
+unsigned long pci_sun4v_msi_setvalid(unsigned long devhandle,
 				     unsigned long msinum,
 				     unsigned long valid);
-extern unsigned long pci_sun4v_msi_getmsiq(unsigned long devhandle,
+unsigned long pci_sun4v_msi_getmsiq(unsigned long devhandle,
 				    unsigned long msinum,
 				    unsigned long *msiq);
-extern unsigned long pci_sun4v_msi_setmsiq(unsigned long devhandle,
+unsigned long pci_sun4v_msi_setmsiq(unsigned long devhandle,
 				    unsigned long msinum,
 				    unsigned long msiq,
 				    unsigned long msitype);
-extern unsigned long pci_sun4v_msi_getstate(unsigned long devhandle,
+unsigned long pci_sun4v_msi_getstate(unsigned long devhandle,
 				     unsigned long msinum,
 				     unsigned long *state);
-extern unsigned long pci_sun4v_msi_setstate(unsigned long devhandle,
+unsigned long pci_sun4v_msi_setstate(unsigned long devhandle,
 				     unsigned long msinum,
 				     unsigned long state);
-extern unsigned long pci_sun4v_msg_getmsiq(unsigned long devhandle,
+unsigned long pci_sun4v_msg_getmsiq(unsigned long devhandle,
 				    unsigned long msinum,
 				    unsigned long *msiq);
-extern unsigned long pci_sun4v_msg_setmsiq(unsigned long devhandle,
+unsigned long pci_sun4v_msg_setmsiq(unsigned long devhandle,
 				    unsigned long msinum,
 				    unsigned long msiq);
-extern unsigned long pci_sun4v_msg_getvalid(unsigned long devhandle,
+unsigned long pci_sun4v_msg_getvalid(unsigned long devhandle,
 				     unsigned long msinum,
 				     unsigned long *valid);
-extern unsigned long pci_sun4v_msg_setvalid(unsigned long devhandle,
+unsigned long pci_sun4v_msg_setvalid(unsigned long devhandle,
 				     unsigned long msinum,
 				     unsigned long valid);
 

arch/sparc/kernel/prom.h

@@ -4,7 +4,7 @@
 #include <linux/spinlock.h>
 #include <asm/prom.h>
 
-extern void of_console_init(void);
+void of_console_init(void);
 
 extern unsigned int prom_early_allocated;
 

arch/sparc/kernel/psycho_common.h

@@ -30,18 +30,18 @@ enum psycho_error_type {
 	UE_ERR, CE_ERR, PCI_ERR
 };
 
-extern void psycho_check_iommu_error(struct pci_pbm_info *pbm,
+void psycho_check_iommu_error(struct pci_pbm_info *pbm,
 			      unsigned long afsr,
 			      unsigned long afar,
 			      enum psycho_error_type type);
 
-extern irqreturn_t psycho_pcierr_intr(int irq, void *dev_id);
+irqreturn_t psycho_pcierr_intr(int irq, void *dev_id);
 
-extern int psycho_iommu_init(struct pci_pbm_info *pbm, int tsbsize,
+int psycho_iommu_init(struct pci_pbm_info *pbm, int tsbsize,
 		      u32 dvma_offset, u32 dma_mask,
 		      unsigned long write_complete_offset);
 
-extern void psycho_pbm_init_common(struct pci_pbm_info *pbm,
+void psycho_pbm_init_common(struct pci_pbm_info *pbm,
 			    struct platform_device *op,
 			    const char *chip_name, int chip_type);
 

arch/sparc/mm/init_64.h

@@ -21,7 +21,7 @@ extern unsigned int sparc64_highest_unlocked_tlb_ent;
 extern unsigned long sparc64_kern_pri_context;
 extern unsigned long sparc64_kern_pri_nuc_bits;
 extern unsigned long sparc64_kern_sec_context;
-extern void mmu_info(struct seq_file *m);
+void mmu_info(struct seq_file *m);
 
 struct linux_prom_translation {
 	unsigned long virt;
@@ -36,7 +36,7 @@ extern unsigned int prom_trans_ents;
 /* Exported for SMP bootup purposes. */
 extern unsigned long kern_locked_tte_data;
 
-extern void prom_world(int enter);
+void prom_world(int enter);
 
 #ifdef CONFIG_SPARSEMEM_VMEMMAP
 #define VMEMMAP_CHUNK_SHIFT	22