aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/pcspeaker.c
diff options
context:
space:
mode:
authorAkinobu Mita <akinobu.mita@gmail.com>2008-09-21 10:25:40 -0400
committerIngo Molnar <mingo@elte.hu>2008-09-22 06:58:36 -0400
commit153dab77e228931f3aff74f21b762927ac710ca7 (patch)
tree0ddebf1dd12862ee0eb7f42dc5ae5106942f2746 /arch/x86/kernel/pcspeaker.c
parent279b0bbba2bb647348ad90e183b3960aa99eccfd (diff)
x86: use platform_device_register_simple()
Cleanup pcspeaker.c Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/pcspeaker.c')
-rw-r--r--arch/x86/kernel/pcspeaker.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/x86/kernel/pcspeaker.c b/arch/x86/kernel/pcspeaker.c
index bc1f2d3ea277..a311ffcaad16 100644
--- a/arch/x86/kernel/pcspeaker.c
+++ b/arch/x86/kernel/pcspeaker.c
@@ -1,20 +1,13 @@
1#include <linux/platform_device.h> 1#include <linux/platform_device.h>
2#include <linux/errno.h> 2#include <linux/err.h>
3#include <linux/init.h> 3#include <linux/init.h>
4 4
5static __init int add_pcspkr(void) 5static __init int add_pcspkr(void)
6{ 6{
7 struct platform_device *pd; 7 struct platform_device *pd;
8 int ret;
9 8
10 pd = platform_device_alloc("pcspkr", -1); 9 pd = platform_device_register_simple("pcspkr", -1, NULL, 0);
11 if (!pd)
12 return -ENOMEM;
13 10
14 ret = platform_device_add(pd); 11 return IS_ERR(pd) ? PTR_ERR(pd) : 0;
15 if (ret)
16 platform_device_put(pd);
17
18 return ret;
19} 12}
20device_initcall(add_pcspkr); 13device_initcall(add_pcspkr);