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

Commit 63907435 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

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



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0c79358b

arch/m68k/amiga/config.c

+0 −6
Original line number Diff line number Diff line
@@ -105,9 +105,6 @@ static int a2000_hwclk (int, struct rtc_time *); 
static int amiga_set_clock_mmss (unsigned long);

static unsigned int amiga_get_ss (void);

extern void amiga_mksound( unsigned int count, unsigned int ticks );

#ifdef CONFIG_AMIGA_FLOPPY

extern void amiga_floppy_setup(char *, int *);

#endif

static void amiga_reset (void);

extern void amiga_init_sound(void);

static void amiga_savekmsg_init(void);
@@ -427,9 +424,6 @@ void __init config_amiga(void) 


  mach_set_clock_mmss  = amiga_set_clock_mmss;

  mach_get_ss          = amiga_get_ss;

#ifdef CONFIG_AMIGA_FLOPPY

  mach_floppy_setup    = amiga_floppy_setup;

#endif

  mach_reset           = amiga_reset;

#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)

  mach_beep            = amiga_mksound;

arch/m68k/atari/config.c

+0 −6
Original line number Diff line number Diff line
@@ -52,9 +52,6 @@ int atari_rtc_year_offset; 


/* local function prototypes */

static void atari_reset( void );

#ifdef CONFIG_ATARI_FLOPPY

extern void atari_floppy_setup(char *, int *);

#endif

static void atari_get_model(char *model);

static int atari_get_hardware_list(char *buffer);
@@ -244,9 +241,6 @@ void __init config_atari(void) 
    mach_get_irq_list	 = show_atari_interrupts;

    mach_gettimeoffset   = atari_gettimeoffset;

    mach_reset           = atari_reset;

#ifdef CONFIG_ATARI_FLOPPY

    mach_floppy_setup	 = atari_floppy_setup;

#endif

    mach_max_dma_address = 0xffffff;

#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)

    mach_beep          = atari_mksound;

arch/m68k/kernel/setup.c

+0 −13
Original line number Diff line number Diff line
@@ -84,9 +84,6 @@ void (*mach_reset)( void ); 
void (*mach_halt)( void );

void (*mach_power_off)( void );

long mach_max_dma_address = 0x00ffffff; /* default set to the lower 16MB */

#if defined(CONFIG_AMIGA_FLOPPY) || defined(CONFIG_ATARI_FLOPPY)

void (*mach_floppy_setup) (char *, int *) __initdata = NULL;

#endif

#ifdef CONFIG_HEARTBEAT

void (*mach_heartbeat) (int);

EXPORT_SYMBOL(mach_heartbeat);
@@ -527,16 +524,6 @@ int get_hardware_list(char *buffer) 
    return(len);

}





#if defined(CONFIG_AMIGA_FLOPPY) || defined(CONFIG_ATARI_FLOPPY)

void __init floppy_setup(char *str, int *ints)

{

	if (mach_floppy_setup)

		mach_floppy_setup (str, ints);

}



#endif



void check_bugs(void)

{

#ifndef CONFIG_M68KFPU_EMU

arch/m68k/q40/config.c

+0 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ 
#include <asm/machdep.h>

#include <asm/q40_master.h>



extern void floppy_setup(char *str, int *ints);



extern irqreturn_t q40_process_int (int level, struct pt_regs *regs);

extern irqreturn_t (*q40_default_handler[]) (int, void *, struct pt_regs *);  /* added just for debugging */

extern void q40_init_IRQ (void);

arch/ppc/amiga/config.c

+0 −6
Original line number Diff line number Diff line
@@ -90,9 +90,6 @@ static void a3000_gettod (int *, int *, int *, int *, int *, int *); 
static void a2000_gettod (int *, int *, int *, int *, int *, int *);

static int amiga_hwclk (int, struct hwclk_time *);

static int amiga_set_clock_mmss (unsigned long);

#ifdef CONFIG_AMIGA_FLOPPY

extern void amiga_floppy_setup(char *, int *);

#endif

static void amiga_reset (void);

extern void amiga_init_sound(void);

static void amiga_savekmsg_init(void);
@@ -419,9 +416,6 @@ void __init config_amiga(void) 


  mach_hwclk           = amiga_hwclk;

  mach_set_clock_mmss  = amiga_set_clock_mmss;

#ifdef CONFIG_AMIGA_FLOPPY

  mach_floppy_setup    = amiga_floppy_setup;

#endif

  mach_reset           = amiga_reset;

#ifdef CONFIG_HEARTBEAT

  mach_heartbeat = amiga_heartbeat;