[Hackndev-commit] SF.net SVN: hackndev: [792] linux4palm/linux/trunk/arch/arm/mach-pxa/ palmz72/palmz72_battery.c

[<hap...@us...>]

Revision: 792
          http://svn.sourceforge.net/hackndev/?rev=792&view=rev
Author:   happy-slapin
Date:     2007-02-02 18:07:36 -0800 (Fri, 02 Feb 2007)

Log Message:
-----------
z72: Cleaned up a bit

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_battery.c

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_battery.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_battery.c	2007-02-02 23:47:44 UTC (rev 791)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_battery.c	2007-02-03 02:07:36 UTC (rev 792)
@@ -47,6 +47,10 @@
 
 struct palmz72_battery_dev bat;
 
+#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
+/* original APM hook */
+static void (*apm_get_power_status_orig)(struct apm_power_info *info);
+#endif
 
 int palmz72_battery_min_voltage(struct battery *b)
 {
@@ -115,18 +119,39 @@
 
 static int palmz72_wm97xx_remove(struct device *dev)
 {
-//    struct wm97xx *wm = dev->driver_data;
     return 0;
 }
 
+static void
+palmz72_wm97xx_shutdown(struct device *dev)
+{
+#ifdef CONFIG_APM
+    apm_get_power_status = apm_get_power_status_orig;
+#endif
+}
+
+static int
+palmz72_wm97xx_suspend(struct device *dev, pm_message_t state)
+{
+	return 0;
+}
+
+static int
+palmz72_wm97xx_resume(struct device *dev)
+{
+	return 0;
+}
+
+
 static struct device_driver  palmz72_wm97xx_driver = {
     .name = "wm97xx-touchscreen",
     .bus = &wm97xx_bus_type,
     .owner = THIS_MODULE,
     .probe = palmz72_wm97xx_probe,
     .remove = palmz72_wm97xx_remove,
-    .suspend = NULL,
-    .resume = NULL
+    .suspend = palmz72_wm97xx_suspend,
+    .resume = palmz72_wm97xx_resume,
+    .shutdown = palmz72_wm97xx_shutdown
 };
 
 static int palmz72_ac_is_connected (void){
@@ -189,6 +214,7 @@
 	printk("Battery registered\n");
     }
 #ifdef CONFIG_APM
+    apm_get_power_status_orig = apm_get_power_status;
     apm_get_power_status = palmz72_apm_get_power_status;
 #endif
     return driver_register(&palmz72_wm97xx_driver);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.