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

Commit 07b81259 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

m68k/sun3/: possible cleanups 



This patch contains the following possible cleanups:
- make the following needlessly global code static:
  - config.c: sun3_bootmem_alloc()
  - config.c: sun3_sched_init()
  - dvma.c: dvma_page()
  - idprom.c: struct Sun_Machines[]
  - mmu_emu.c: struct ctx_alloc[]
  - sun3dvma.c: iommu_use[]
  - sun3ints.c: led_pattern[]
- remove the unused sbus.c

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 22deb527

arch/m68k/sun3/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,6 @@ 
# Makefile for Linux arch/m68k/sun3 source directory

#



obj-y	:= sun3ints.o sun3dvma.o sbus.o idprom.o

obj-y	:= sun3ints.o sun3dvma.o idprom.o



obj-$(CONFIG_SUN3) += config.o mmu_emu.o leds.o dvma.o intersil.o

arch/m68k/sun3/config.c

+4 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ extern char _text, _end; 
char sun3_reserved_pmeg[SUN3_PMEGS_NUM];



extern unsigned long sun3_gettimeoffset(void);

extern void sun3_sched_init(irq_handler_t handler);

static void sun3_sched_init(irq_handler_t handler);

extern void sun3_get_model (char* model);

extern void idprom_init (void);

extern int sun3_hwclk(int set, struct rtc_time *t);
@@ -114,7 +114,8 @@ static void sun3_halt (void) 


/* sun3 bootmem allocation */



void __init sun3_bootmem_alloc(unsigned long memory_start, unsigned long memory_end)

static void __init sun3_bootmem_alloc(unsigned long memory_start,

				      unsigned long memory_end)

{

	unsigned long start_page;
@@ -164,7 +165,7 @@ void __init config_sun3(void) 
	sun3_bootmem_alloc(memory_start, memory_end);

}



void __init sun3_sched_init(irq_handler_t timer_routine)

static void __init sun3_sched_init(irq_handler_t timer_routine)

{

	sun3_disable_interrupts();

        intersil_clock->cmd_reg=(INTERSIL_RUN|INTERSIL_INT_DISABLE|INTERSIL_24H_MODE);

arch/m68k/sun3/dvma.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


static unsigned long ptelist[120];



inline unsigned long dvma_page(unsigned long kaddr, unsigned long vaddr)

static unsigned long dvma_page(unsigned long kaddr, unsigned long vaddr)

{

	unsigned long pte;

	unsigned long j;

arch/m68k/sun3/idprom.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static struct idprom idprom_buffer; 
 * of the Sparc CPU and have a meaningful IDPROM machtype value that we

 * know about.  See asm-sparc/machines.h for empirical constants.

 */

struct Sun_Machine_Models Sun_Machines[NUM_SUN_MACHINES] = {

static struct Sun_Machine_Models Sun_Machines[NUM_SUN_MACHINES] = {

/* First, Sun3's */

    { .name = "Sun 3/160 Series",	.id_machtype = (SM_SUN3 | SM_3_160) },

    { .name = "Sun 3/50",		.id_machtype = (SM_SUN3 | SM_3_50) },

arch/m68k/sun3/mmu_emu.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ unsigned char pmeg_ctx[PMEGS_NUM]; 


/* pointers to the mm structs for each task in each

   context. 0xffffffff is a marker for kernel context */

struct mm_struct *ctx_alloc[CONTEXTS_NUM] = {

static struct mm_struct *ctx_alloc[CONTEXTS_NUM] = {

    [0] = (struct mm_struct *)0xffffffff

};