aboutsummaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@insightbb.com>2007-04-12 01:36:12 -0400
committerDmitry Torokhov <dtor@insightbb.com>2007-04-12 01:36:12 -0400
commitd0a0515fc30b55d4b09395d44762c5f41d6d02d5 (patch)
tree255bf2240af254be7c5cdb6068beb49ef9365bfa /drivers/input
parent0de9550971a0ee614ea4f06655e8a49aa3a942a8 (diff)
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>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/misc/cobalt_btns.c24
1 files changed, 1 insertions, 23 deletions
diff --git a/drivers/input/misc/cobalt_btns.c b/drivers/input/misc/cobalt_btns.c
index b14f49e768c..b9b2d7764e7 100644
--- 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);