aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-07-17 15:16:23 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-20 20:24:39 -0400
commit0795dbcc4c4c93a929463957993c04cf5fec346c (patch)
tree394d446ba697bda0a5f52f5d730c820fdfa905d8 /arch/m68k
parent880e5e212ec5ab12411e40c78bd5ac501e9caeed (diff)
m68k/amiga/: possible cleanups
This patch contains the following possible cleanups: - amiints.c: add a proper prototype for amiga_init_IRQ() in include/asm-m68k/amigaints.h - make the following needlessly global code static: - config.c: amiga_model - config.c: amiga_psfreq - config.c: amiga_serial_console_write() - #if 0 the following unused functions: - config.c: amiga_serial_puts() - config.c: amiga_serial_console_wait_key() - config.c: amiga_serial_gets() - remove the following unused variable: - config.c: amiga_masterclock Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/amiga/config.c20
1 files changed, 6 insertions, 14 deletions
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c
index dd0734e54bb8..df679d96b1cb 100644
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
@@ -36,14 +36,11 @@
36#include <asm/machdep.h> 36#include <asm/machdep.h>
37#include <asm/io.h> 37#include <asm/io.h>
38 38
39unsigned long amiga_model; 39static unsigned long amiga_model;
40EXPORT_SYMBOL(amiga_model);
41 40
42unsigned long amiga_eclock; 41unsigned long amiga_eclock;
43EXPORT_SYMBOL(amiga_eclock); 42EXPORT_SYMBOL(amiga_eclock);
44 43
45unsigned long amiga_masterclock;
46
47unsigned long amiga_colorclock; 44unsigned long amiga_colorclock;
48EXPORT_SYMBOL(amiga_colorclock); 45EXPORT_SYMBOL(amiga_colorclock);
49 46
@@ -53,7 +50,7 @@ EXPORT_SYMBOL(amiga_chipset);
53unsigned char amiga_vblank; 50unsigned char amiga_vblank;
54EXPORT_SYMBOL(amiga_vblank); 51EXPORT_SYMBOL(amiga_vblank);
55 52
56unsigned char amiga_psfreq; 53static unsigned char amiga_psfreq;
57 54
58struct amiga_hw_present amiga_hw_present; 55struct amiga_hw_present amiga_hw_present;
59EXPORT_SYMBOL(amiga_hw_present); 56EXPORT_SYMBOL(amiga_hw_present);
@@ -94,8 +91,6 @@ static char *amiga_models[] __initdata = {
94static char amiga_model_name[13] = "Amiga "; 91static char amiga_model_name[13] = "Amiga ";
95 92
96static void amiga_sched_init(irq_handler_t handler); 93static void amiga_sched_init(irq_handler_t handler);
97/* amiga specific irq functions */
98extern void amiga_init_IRQ(void);
99static void amiga_get_model(char *model); 94static void amiga_get_model(char *model);
100static int amiga_get_hardware_list(char *buffer); 95static int amiga_get_hardware_list(char *buffer);
101/* amiga specific timer functions */ 96/* amiga specific timer functions */
@@ -109,8 +104,6 @@ static void amiga_reset(void);
109extern void amiga_init_sound(void); 104extern void amiga_init_sound(void);
110static void amiga_mem_console_write(struct console *co, const char *b, 105static void amiga_mem_console_write(struct console *co, const char *b,
111 unsigned int count); 106 unsigned int count);
112void amiga_serial_console_write(struct console *co, const char *s,
113 unsigned int count);
114#ifdef CONFIG_HEARTBEAT 107#ifdef CONFIG_HEARTBEAT
115static void amiga_heartbeat(int on); 108static void amiga_heartbeat(int on);
116#endif 109#endif
@@ -420,8 +413,7 @@ void __init config_amiga(void)
420 mach_heartbeat = amiga_heartbeat; 413 mach_heartbeat = amiga_heartbeat;
421#endif 414#endif
422 415
423 /* Fill in the clock values (based on the 700 kHz E-Clock) */ 416 /* Fill in the clock value (based on the 700 kHz E-Clock) */
424 amiga_masterclock = 40*amiga_eclock; /* 28 MHz */
425 amiga_colorclock = 5*amiga_eclock; /* 3.5 MHz */ 417 amiga_colorclock = 5*amiga_eclock; /* 3.5 MHz */
426 418
427 /* clear all DMA bits */ 419 /* clear all DMA bits */
@@ -819,8 +811,8 @@ static void amiga_serial_putc(char c)
819 ; 811 ;
820} 812}
821 813
822void amiga_serial_console_write(struct console *co, const char *s, 814static void amiga_serial_console_write(struct console *co, const char *s,
823 unsigned int count) 815 unsigned int count)
824{ 816{
825 while (count--) { 817 while (count--) {
826 if (*s == '\n') 818 if (*s == '\n')
@@ -829,7 +821,7 @@ void amiga_serial_console_write(struct console *co, const char *s,
829 } 821 }
830} 822}
831 823
832#ifdef CONFIG_SERIAL_CONSOLE 824#if 0
833void amiga_serial_puts(const char *s) 825void amiga_serial_puts(const char *s)
834{ 826{
835 amiga_serial_console_write(NULL, s, strlen(s)); 827 amiga_serial_console_write(NULL, s, strlen(s));