Revision: 1007
http://svn.sourceforge.net/hackndev/?rev=1007&view=rev
Author: farcaller
Date: 2007-05-28 07:30:17 -0700 (Mon, 28 May 2007)
Log Message:
-----------
palmt3: rewritten buttons code with platform_device. Suspend works
Modified Paths:
--------------
linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_buttons.c
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_buttons.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_buttons.c 2007-05-27 23:36:07 UTC (rev 1006)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_buttons.c 2007-05-28 14:30:17 UTC (rev 1007)
@@ -19,6 +19,7 @@
#include <asm/hardware.h>
#include <asm/arch/pxa-regs.h>
#include <asm/arch/irqs.h>
+#include <linux/platform_device.h>
//#define PALMT3_BUTTONS_DEBUG
@@ -224,10 +225,9 @@
}
}
-static int palmt3_btn_probe(struct device *dev)
+static int palmt3_btn_probe(struct platform_device *dev)
{
unsigned long flags, ret;
- DBG("Probing device\n" );
buttons_dev = input_allocate_device();
buttons_dev->evbit[0] = BIT(EV_KEY);
@@ -291,9 +291,8 @@
return 0;
}
-static int palmt3_btn_remove (struct device *dev)
+static int palmt3_btn_remove (struct platform_device *dev)
{
- DBG("removing device...\n");
destroy_workqueue(palmt3_workqueue);
input_unregister_device(buttons_dev);
@@ -304,29 +303,27 @@
return 0;
}
-static struct device_driver palmt3_buttons_driver = {
- .name = "palmt3-btn",
- .bus = &platform_bus_type,
- .probe = palmt3_btn_probe,
- .remove = palmt3_btn_remove,
+static struct platform_driver palmt3_buttons_driver = {
+ .driver = {
+ .name = "palmt3-btn",
+ .owner = THIS_MODULE,
+ },
+ .probe = palmt3_btn_probe,
+ .remove = palmt3_btn_remove,
#ifdef CONFIG_PM
- .suspend = NULL,
- .resume = NULL,
+ .suspend = NULL,
+ .resume = NULL,
#endif
};
static int __init palmt3_btn_init(void)
{
- DBG("init\n");
-
- return driver_register(&palmt3_buttons_driver);
+ return platform_driver_register(&palmt3_buttons_driver);
}
static void __exit palmt3_btn_cleanup(void)
{
- DBG("unloading...\n");
-
- driver_unregister(&palmt3_buttons_driver);
+ platform_driver_unregister(&palmt3_buttons_driver);
}
module_init(palmt3_btn_init);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
