Skip to contentSkip to conversation

x86: use platform_device_register_simple()

PATCH Applied Akinobu Mita 2 participants 2 messages Sep 21, 2008 – Sep 22, 2008 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: use platform_device_register_simple()

Cleanup pcspeaker.c

Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
---
 arch/x86/kernel/pcspeaker.c |   13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
arch/x86/kernel/pcspeaker.c +3 -10
Index: 2.6-git/arch/x86/kernel/pcspeaker.c
===================================================================
@@ -1,20 +1,13 @@
 #include <linux/platform_device.h>
-#include <linux/errno.h>
+#include <linux/err.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;
+	pd = platform_device_register_simple("pcspkr", -1, NULL, 0);
 
-	ret = platform_device_add(pd);
-	if (ret)
-		platform_device_put(pd);
-
-	return ret;
+	return IS_ERR(pd) ? PTR_ERR(pd) : 0;
 }
 device_initcall(add_pcspkr);
Applied
#1 lore raw

arch/x86/kernel/pcspeaker.c line 9

Quoted 4 lines · Akinobu Mita

Cleanup pcspeaker.c

arch/x86/kernel/pcspeaker.c +1 -1
-	pd = platform_device_alloc("pcspkr", -1);
+	pd = platform_device_register_simple("pcspkr", -1, NULL, 0);

applied to tip/x86/cleanups, thanks!

Ingo