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

Commit e5c6c8e4 authored by Michael Neuling's avatar Michael Neuling Committed by Dmitry Torokhov
Browse files

Input: pcspkr - separate device and driver registration 



The current pcspkr code combines the device and driver registration.
This patch splits these, putting the device registration in the arch
specific code.

PowerPC and MIPS only have the pcspkr present sometimes.

Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent aaef685d

arch/alpha/kernel/setup.c

+18 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/init.h>

#include <linux/string.h>

#include <linux/ioport.h>

#include <linux/platform_device.h>

#include <linux/bootmem.h>

#include <linux/pci.h>

#include <linux/seq_file.h>
@@ -1484,3 +1485,20 @@ alpha_panic_event(struct notifier_block *this, unsigned long event, void *ptr) 
#endif

        return NOTIFY_DONE;

}



static __init int add_pcspkr(void)

{

	struct platform_device *pd;

	int ret;



	pd = platform_device_alloc("pcspkr", -1);

	if (!pd)

		return -ENOMEM;



	ret = platform_device_add(pd);

	if (ret)

		platform_device_put(pd);



	return ret;

}

device_initcall(add_pcspkr);

arch/i386/kernel/setup.c

+18 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/initrd.h>

#include <linux/bootmem.h>

#include <linux/seq_file.h>

#include <linux/platform_device.h>

#include <linux/console.h>

#include <linux/mca.h>

#include <linux/root_dev.h>
@@ -1634,6 +1635,23 @@ void __init setup_arch(char **cmdline_p) 
#endif

}



static __init int add_pcspkr(void)

{

	struct platform_device *pd;

	int ret;



	pd = platform_device_alloc("pcspkr", -1);

	if (!pd)

		return -ENOMEM;



	ret = platform_device_add(pd);

	if (ret)

		platform_device_put(pd);



	return ret;

}

device_initcall(add_pcspkr);



#include "setup_arch_post.h"

/*

 * Local Variables:

arch/mips/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ config MACH_JAZZ 
	select ARC32

	select ARCH_MAY_HAVE_PC_FDC

	select GENERIC_ISA_DMA

	select I8253

	select I8259

	select ISA

	select SYS_HAS_CPU_R4X00
@@ -530,6 +531,7 @@ config QEMU 
	select DMA_COHERENT

	select GENERIC_ISA_DMA

	select HAVE_STD_PC_SERIAL_PORT

	select I8253

	select I8259

	select ISA

	select SWAP_IO_SPACE
@@ -714,6 +716,7 @@ config SNI_RM200_PCI 
	select HAVE_STD_PC_SERIAL_PORT

	select HW_HAS_EISA

	select HW_HAS_PCI

	select I8253

	select I8259

	select ISA

	select SYS_HAS_CPU_R4X00
@@ -1711,6 +1714,9 @@ config MMU 
	bool

	default y



config I8253

	bool



source "drivers/pcmcia/Kconfig"



source "drivers/pci/hotplug/Kconfig"

arch/mips/kernel/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ obj-$(CONFIG_PROC_FS) += proc.o 


obj-$(CONFIG_64BIT)		+= cpu-bugs64.o



obj-$(CONFIG_I8253)		+= i8253.o



CFLAGS_cpu-bugs64.o	= $(shell if $(CC) $(CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)



EXTRA_AFLAGS := $(CFLAGS)

arch/mips/kernel/i8253.c

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2006 IBM Corporation

 *

 * Implements device information for i8253 timer chip

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License version

 * 2 as published by the Free Software Foundation

 */



#include <linux/platform_device.h>



static __init int add_pcspkr(void)

{

	struct platform_device *pd;

	int ret;



	pd = platform_device_alloc("pcspkr", -1);

	if (!pd)

		return -ENOMEM;



	ret = platform_device_add(pd);

	if (ret)

		platform_device_put(pd);



	return ret;

}

device_initcall(add_pcspkr);