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

Commit 62cc4939 authored by Andi Kleen's avatar Andi Kleen Committed by Andi Kleen
Browse files

[PATCH] x86: Unify pcspeaker platform device code between i386/x86-64 



Trivial cleanup.

Only change is that it is always compiled in now on x86-64 like on i386.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 40d22c1b

arch/i386/kernel/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,7 @@ obj-$(CONFIG_K8_NB) += k8.o 




obj-$(CONFIG_VMI)		+= vmi.o vmitime.o

obj-$(CONFIG_VMI)		+= vmi.o vmitime.o

obj-$(CONFIG_PARAVIRT)		+= paravirt.o

obj-$(CONFIG_PARAVIRT)		+= paravirt.o

obj-y				+= pcspeaker.o





EXTRA_AFLAGS   := -traditional

EXTRA_AFLAGS   := -traditional

arch/i386/kernel/pcspeaker.c

0 → 100644
+20 −0
Original line number Original line Diff line number Diff line 
#include <linux/platform_device.h>

#include <linux/errno.h>

#include <linux/init.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);

arch/i386/kernel/setup.c

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

#include <linux/initrd.h>

#include <linux/bootmem.h>

#include <linux/bootmem.h>

#include <linux/seq_file.h>

#include <linux/seq_file.h>

#include <linux/platform_device.h>

#include <linux/console.h>

#include <linux/console.h>

#include <linux/mca.h>

#include <linux/mca.h>

#include <linux/root_dev.h>

#include <linux/root_dev.h>
@@ -660,28 +659,3 @@ void __init setup_arch(char **cmdline_p) 
#endif

#endif

	tsc_init();

	tsc_init();

}
 
}
 


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);



/*

 * Local Variables:

 * mode:c

 * c-file-style:"k&r"

 * c-basic-offset:8

 * End:

 */

arch/x86_64/kernel/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,7 @@ obj-$(CONFIG_PCI) += early-quirks.o 




obj-y				+= topology.o

obj-y				+= topology.o

obj-y				+= intel_cacheinfo.o

obj-y				+= intel_cacheinfo.o

obj-y				+= pcspeaker.o





CFLAGS_vsyscall.o		:= $(PROFILING) -g0

CFLAGS_vsyscall.o		:= $(PROFILING) -g0
@@ -56,3 +57,4 @@ quirks-y += ../../i386/kernel/quirks.o 
i8237-y				+= ../../i386/kernel/i8237.o

i8237-y				+= ../../i386/kernel/i8237.o

msr-$(subst m,y,$(CONFIG_X86_MSR))  += ../../i386/kernel/msr.o

msr-$(subst m,y,$(CONFIG_X86_MSR))  += ../../i386/kernel/msr.o

alternative-y			+= ../../i386/kernel/alternative.o

alternative-y			+= ../../i386/kernel/alternative.o

pcspeaker-y			+= ../../i386/kernel/pcspeaker.o

arch/x86_64/kernel/setup.c

+0 −20
Original line number Original line Diff line number Diff line
@@ -1104,23 +1104,3 @@ struct seq_operations cpuinfo_op = { 
	.stop =	c_stop,

	.stop =	c_stop,

	.show =	show_cpuinfo,

	.show =	show_cpuinfo,

};
 
};
 


#if defined(CONFIG_INPUT_PCSPKR) || defined(CONFIG_INPUT_PCSPKR_MODULE)

#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);

#endif