Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 639074354bb371feb2dde409b2ce05d56afef02b

Authored by Al Viro
Committed by Linus Torvalds
1 parent 0c79358b87

[PATCH] m68k: kill mach_floppy_setup, convert to proper __setup() in drivers 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 10 changed files with 28 additions and 59 deletions Side-by-side Diff

arch/m68k/amiga/config.c
Diff comments   View file @ 6390743
... ... @@ -105,9 +105,6 @@
105 105 static int amiga_set_clock_mmss (unsigned long);
106 106 static unsigned int amiga_get_ss (void);
107 107 extern void amiga_mksound( unsigned int count, unsigned int ticks );
108   -#ifdef CONFIG_AMIGA_FLOPPY
109   -extern void amiga_floppy_setup(char *, int *);
110   -#endif
111 108 static void amiga_reset (void);
112 109 extern void amiga_init_sound(void);
113 110 static void amiga_savekmsg_init(void);
... ... @@ -427,9 +424,6 @@
427 424  
428 425 mach_set_clock_mmss = amiga_set_clock_mmss;
429 426 mach_get_ss = amiga_get_ss;
430   -#ifdef CONFIG_AMIGA_FLOPPY
431   - mach_floppy_setup = amiga_floppy_setup;
432   -#endif
433 427 mach_reset = amiga_reset;
434 428 #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
435 429 mach_beep = amiga_mksound;
arch/m68k/atari/config.c
Diff comments   View file @ 6390743
... ... @@ -52,9 +52,6 @@
52 52  
53 53 /* local function prototypes */
54 54 static void atari_reset( void );
55   -#ifdef CONFIG_ATARI_FLOPPY
56   -extern void atari_floppy_setup(char *, int *);
57   -#endif
58 55 static void atari_get_model(char *model);
59 56 static int atari_get_hardware_list(char *buffer);
60 57  
... ... @@ -244,9 +241,6 @@
244 241 mach_get_irq_list = show_atari_interrupts;
245 242 mach_gettimeoffset = atari_gettimeoffset;
246 243 mach_reset = atari_reset;
247   -#ifdef CONFIG_ATARI_FLOPPY
248   - mach_floppy_setup = atari_floppy_setup;
249   -#endif
250 244 mach_max_dma_address = 0xffffff;
251 245 #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
252 246 mach_beep = atari_mksound;
arch/m68k/kernel/setup.c
Diff comments   View file @ 6390743
... ... @@ -84,9 +84,6 @@
84 84 void (*mach_halt)( void );
85 85 void (*mach_power_off)( void );
86 86 long mach_max_dma_address = 0x00ffffff; /* default set to the lower 16MB */
87   -#if defined(CONFIG_AMIGA_FLOPPY) || defined(CONFIG_ATARI_FLOPPY)
88   -void (*mach_floppy_setup) (char *, int *) __initdata = NULL;
89   -#endif
90 87 #ifdef CONFIG_HEARTBEAT
91 88 void (*mach_heartbeat) (int);
92 89 EXPORT_SYMBOL(mach_heartbeat);
... ... @@ -526,16 +523,6 @@
526 523  
527 524 return(len);
528 525 }
529   -
530   -
531   -#if defined(CONFIG_AMIGA_FLOPPY) || defined(CONFIG_ATARI_FLOPPY)
532   -void __init floppy_setup(char *str, int *ints)
533   -{
534   - if (mach_floppy_setup)
535   - mach_floppy_setup (str, ints);
536   -}
537   -
538   -#endif
539 526  
540 527 void check_bugs(void)
541 528 {
arch/m68k/q40/config.c
Diff comments   View file @ 6390743
... ... @@ -36,8 +36,6 @@
36 36 #include <asm/machdep.h>
37 37 #include <asm/q40_master.h>
38 38  
39   -extern void floppy_setup(char *str, int *ints);
40   -
41 39 extern irqreturn_t q40_process_int (int level, struct pt_regs *regs);
42 40 extern irqreturn_t (*q40_default_handler[]) (int, void *, struct pt_regs *); /* added just for debugging */
43 41 extern void q40_init_IRQ (void);
arch/ppc/amiga/config.c
Diff comments   View file @ 6390743
... ... @@ -90,9 +90,6 @@
90 90 static void a2000_gettod (int *, int *, int *, int *, int *, int *);
91 91 static int amiga_hwclk (int, struct hwclk_time *);
92 92 static int amiga_set_clock_mmss (unsigned long);
93   -#ifdef CONFIG_AMIGA_FLOPPY
94   -extern void amiga_floppy_setup(char *, int *);
95   -#endif
96 93 static void amiga_reset (void);
97 94 extern void amiga_init_sound(void);
98 95 static void amiga_savekmsg_init(void);
... ... @@ -419,9 +416,6 @@
419 416  
420 417 mach_hwclk = amiga_hwclk;
421 418 mach_set_clock_mmss = amiga_set_clock_mmss;
422   -#ifdef CONFIG_AMIGA_FLOPPY
423   - mach_floppy_setup = amiga_floppy_setup;
424   -#endif
425 419 mach_reset = amiga_reset;
426 420 #ifdef CONFIG_HEARTBEAT
427 421 mach_heartbeat = amiga_heartbeat;
arch/ppc/platforms/apus_setup.c
Diff comments   View file @ 6390743
... ... @@ -55,9 +55,6 @@
55 55 int (*mach_set_clock_mmss) (unsigned long) = NULL;
56 56 void (*mach_reset)( void );
57 57 long mach_max_dma_address = 0x00ffffff; /* default set to the lower 16MB */
58   -#if defined(CONFIG_AMIGA_FLOPPY)
59   -void (*mach_floppy_setup) (char *, int *) __initdata = NULL;
60   -#endif
61 58 #ifdef CONFIG_HEARTBEAT
62 59 void (*mach_heartbeat) (int) = NULL;
63 60 extern void apus_heartbeat (void);
... ... @@ -76,7 +73,6 @@
76 73  
77 74 struct mem_info ramdisk;
78 75  
79   -extern void amiga_floppy_setup(char *, int *);
80 76 extern void config_amiga(void);
81 77  
82 78 static int __60nsram = 0;
... ... @@ -304,16 +300,6 @@
304 300 void kbd_reset_setup(char *str, int *ints)
305 301 {
306 302 }
307   -
308   -/*********************************************************** FLOPPY */
309   -#if defined(CONFIG_AMIGA_FLOPPY)
310   -__init
311   -void floppy_setup(char *str, int *ints)
312   -{
313   - if (mach_floppy_setup)
314   - mach_floppy_setup (str, ints);
315   -}
316   -#endif
317 303  
318 304 /*********************************************************** MEMORY */
319 305 #define KMAP_MAX 32
drivers/block/amiflop.c
Diff comments   View file @ 6390743
... ... @@ -1654,12 +1654,6 @@
1654 1654 .media_changed = amiga_floppy_change,
1655 1655 };
1656 1656  
1657   -void __init amiga_floppy_setup (char *str, int *ints)
1658   -{
1659   - printk (KERN_INFO "amiflop: Setting default df0 to %x\n", ints[1]);
1660   - fd_def_df0 = ints[1];
1661   -}
1662   -
1663 1657 static int __init fd_probe_drives(void)
1664 1658 {
1665 1659 int drive,drives,nomem;
... ... @@ -1845,5 +1839,19 @@
1845 1839 unregister_blkdev(FLOPPY_MAJOR, "fd");
1846 1840 }
1847 1841 #endif
  1842 +
  1843 +#else
  1844 +static int __init amiga_floppy_setup (char *str)
  1845 +{
  1846 + int n;
  1847 + if (!MACH_IS_AMIGA)
  1848 + return 0;
  1849 + if (!get_option(&str, &n))
  1850 + return 0;
  1851 + printk (KERN_INFO "amiflop: Setting default df0 to %x\n", n);
  1852 + fd_def_df0 = n;
  1853 +}
  1854 +
  1855 +__setup("floppy=", amiga_floppy_setup);
1848 1856 #endif
drivers/block/ataflop.c
Diff comments   View file @ 6390743
... ... @@ -1951,14 +1951,20 @@
1951 1951 return -ENOMEM;
1952 1952 }
1953 1953  
1954   -
1955   -void __init atari_floppy_setup( char *str, int *ints )
  1954 +#ifndef MODULE
  1955 +static int __init atari_floppy_setup(char *str)
1956 1956 {
  1957 + int ints[3 + FD_MAX_UNITS];
1957 1958 int i;
  1959 +
  1960 + if (!MACH_IS_ATARI)
  1961 + return 0;
  1962 +
  1963 + str = get_options(str, 3 + FD_MAX_UNITS, ints);
1958 1964  
1959 1965 if (ints[0] < 1) {
1960 1966 printk(KERN_ERR "ataflop_setup: no arguments!\n" );
1961   - return;
  1967 + return 0;
1962 1968 }
1963 1969 else if (ints[0] > 2+FD_MAX_UNITS) {
1964 1970 printk(KERN_ERR "ataflop_setup: too many arguments\n" );
1965 1971  
... ... @@ -1978,9 +1984,13 @@
1978 1984 else
1979 1985 UserSteprate[i-3] = ints[i];
1980 1986 }
  1987 + return 1;
1981 1988 }
1982 1989  
1983   -static void atari_floppy_exit(void)
  1990 +__setup("floppy=", atari_floppy_setup);
  1991 +#endif
  1992 +
  1993 +static void __exit atari_floppy_exit(void)
1984 1994 {
1985 1995 int i;
1986 1996 blk_unregister_region(MKDEV(FLOPPY_MAJOR, 0), 256);
include/asm-m68k/machdep.h
Diff comments   View file @ 6390743
... ... @@ -34,7 +34,6 @@
34 34 extern unsigned long (*mach_hd_init) (unsigned long, unsigned long);
35 35 extern void (*mach_hd_setup)(char *, int *);
36 36 extern long mach_max_dma_address;
37   -extern void (*mach_floppy_setup)(char *, int *);
38 37 extern void (*mach_heartbeat) (int);
39 38 extern void (*mach_l2_flush) (int);
40 39 extern void (*mach_beep) (unsigned int, unsigned int);
include/asm-m68knommu/machdep.h
Diff comments   View file @ 6390743
... ... @@ -38,7 +38,6 @@
38 38 extern unsigned long (*mach_hd_init) (unsigned long, unsigned long);
39 39 extern void (*mach_hd_setup)(char *, int *);
40 40 extern long mach_max_dma_address;
41   -extern void (*mach_floppy_setup)(char *, int *);
42 41 extern void (*mach_floppy_eject)(void);
43 42 extern void (*mach_heartbeat) (int);
44 43 extern void (*mach_l2_flush) (int);