Input: cobalt buttons - separate device and driver registration

Create platform device for cobalt buttons as part of arch setup.
This makes the driver follow current driver model more closely.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Acked-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

diff --git a/arch/mips/cobalt/Makefile b/arch/mips/cobalt/Makefile
index 225ac8f34ccd574cb3dd6f9d68d9d569c4782ada..c35ee25e5578bd0f3c4426eba2d82b6c5732c18e 100644 (file)
--- a/arch/mips/cobalt/Makefile
+++ b/arch/mips/cobalt/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the Cobalt micro systems family specific parts of the kernel
 #
 
-obj-y   := irq.o reset.o setup.o
+obj-y   := irq.o reset.o setup.o buttons.o
 
 obj-$(CONFIG_EARLY_PRINTK)     += console.o
 

diff --git a/arch/mips/cobalt/buttons.c b/arch/mips/cobalt/buttons.c
new file mode 100644 (file)
index 0000000..9e14398
--- /dev/null
+++ b/arch/mips/cobalt/buttons.c
@@ -0,0 +1,54 @@
+/*
+ *  Cobalt buttons platform device.
+ *
+ *  Copyright (C) 2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <linux/platform_device.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+
+static struct resource cobalt_buttons_resource __initdata = {
+       .start  = 0x1d000000,
+       .end    = 0x1d000003,
+       .flags  = IORESOURCE_MEM,
+};
+
+static __init int cobalt_add_buttons(void)
+{
+       struct platform_device *pd;
+       int error;
+
+       pd = platform_device_alloc("Cobalt buttons", -1);
+       if (!pd)
+               return -ENOMEM;
+
+       error = platform_device_add_resources(pd, &cobalt_buttons_resource, 1);
+       if (error)
+               goto err_free_device;
+
+       error = platform_device_add(pd);
+       if (error)
+               goto err_free_device;
+
+       return 0;
+
+ err_free_device:
+       platform_device_put(pd);
+       return error;
+}
+device_initcall(cobalt_add_buttons);

diff --git a/drivers/input/misc/cobalt_btns.c b/drivers/input/misc/cobalt_btns.c
index b14f49e768cca461be2fdee5b6a9676df834f3d2..b9b2d7764e735f60ab6dbeb1d6680143f0901a62 100644 (file)
--- a/drivers/input/misc/cobalt_btns.c
+++ b/drivers/input/misc/cobalt_btns.c
@@ -50,14 +50,6 @@ static struct buttons_map buttons_map[] = {
        { 0x80000000, KEY_SELECT, },
 };
 
-static struct resource cobalt_buttons_resource __initdata = {
-       .start  = 0x1d000000,
-       .end    = 0x1d000003,
-       .flags  = IORESOURCE_MEM,
-};
-
-static struct platform_device *cobalt_buttons_device;
-
 static struct timer_list buttons_timer;
 
 static void handle_buttons(unsigned long data)
@@ -183,26 +175,12 @@ static struct platform_driver cobalt_buttons_driver = {
 
 static int __init cobalt_buttons_init(void)
 {
-       int retval;
-
-       cobalt_buttons_device = platform_device_register_simple("Cobalt buttons", -1,
-                                                               &cobalt_buttons_resource, 1);
-       if (IS_ERR(cobalt_buttons_device)) {
-               retval = PTR_ERR(cobalt_buttons_device);
-               return retval;
-       }
-
-       retval = platform_driver_register(&cobalt_buttons_driver);
-       if (retval < 0)
-               platform_device_unregister(cobalt_buttons_device);
-
-       return retval;
+       return platform_driver_register(&cobalt_buttons_driver);
 }
 
 static void __exit cobalt_buttons_exit(void)
 {
        platform_driver_unregister(&cobalt_buttons_driver);
-       platform_device_unregister(cobalt_buttons_device);
 }
 
 module_init(cobalt_buttons_init);