hackndev-commit

[Hackndev-commit] SF.net SVN: hackndev: [1337] linux4palm/linux/trunk/arch/arm/mach-pxa/ palmld/palmld_battery.c

[<mar...@us...>]

Revision: 1337
          http://hackndev.svn.sourceforge.net/hackndev/?rev=1337&view=rev
Author:   marex_z71
Date:     2007-09-21 08:22:10 -0700 (Fri, 21 Sep 2007)

Log Message:
-----------
PalmLD: improved coding style of battery driver and added few fallback security measurements

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_battery.c

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_battery.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_battery.c	2007-09-21 14:42:29 UTC (rev 1336)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_battery.c	2007-09-21 15:22:10 UTC (rev 1337)
@@ -69,28 +69,25 @@
 
 int palmld_battery_get_voltage(struct power_supply *b)
 {
-    if (bat.battery_registered){
+    if (bat.battery_registered) {
     	bat.previous_voltage = bat.current_voltage;
     	bat.current_voltage = wm97xx_read_aux_adc(bat.wm,  WM97XX_AUX_ID3);
 	bat.last_battery_update = jiffies;
     	return bat.current_voltage * 1889/1000 + 7678/10;
     }
-    else{
-    	printk("palmld_battery: cannot get voltage -> battery driver unregistered\n");
-    	return 0;
-    }
+
+    printk("palmld_battery: cannot get voltage -> battery driver unregistered\n");
+    return 0;
 }
 
 int palmld_battery_get_capacity(struct power_supply *b)
 {
-    if (bat.battery_registered){
-	return (((palmld_battery_get_voltage(b)-palmld_battery_min_voltage(b))
-	/(palmld_battery_max_voltage(b)-palmld_battery_min_voltage(b)))*100);
-    }
-    else{
-    	printk("palmld_battery: cannot get capacity -> battery driver unregistered\n");
-    	return 0;
-    }
+    if (bat.battery_registered)
+	return (((palmld_battery_get_voltage(b)-palmld_battery_min_voltage(b))/
+	(palmld_battery_max_voltage(b)-palmld_battery_min_voltage(b)))*100);
+
+    printk("palmld_battery: cannot get capacity -> battery driver unregistered\n");
+    return 0;
 }
 
 int palmld_battery_get_status(struct power_supply *b)
@@ -106,8 +103,6 @@
 		return POWER_SUPPLY_STATUS_NOT_CHARGING;
 }
 
-int tmp;
-
 static int palmld_battery_get_property(struct power_supply *b,
 				enum power_supply_property psp,
 				union power_supply_propval *val)
@@ -247,9 +242,8 @@
 
     /* register battery to APM layer */
     bat.battery_registered = 0;
-    if(power_supply_register(NULL, &palmld_battery)) {
+    if(power_supply_register(NULL, &palmld_battery))
 	printk(KERN_ERR "palmld_ac97_probe: could not register battery class\n");
-    }
     else {
 	bat.battery_registered = 1;
 	printk("Battery registered\n");


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

[Hackndev-commit] SF.net SVN: hackndev: [1338] linux4palm/linux/trunk/arch/arm/mach-pxa/ palmld/palmld_battery.c

[<mar...@us...>]

Revision: 1338
          http://hackndev.svn.sourceforge.net/hackndev/?rev=1338&view=rev
Author:   marex_z71
Date:     2007-09-24 08:12:00 -0700 (Mon, 24 Sep 2007)

Log Message:
-----------
PalmLD: stupid formating changes

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_battery.c

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_battery.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_battery.c	2007-09-21 15:22:10 UTC (rev 1337)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_battery.c	2007-09-24 15:12:00 UTC (rev 1338)
@@ -186,15 +186,15 @@
 }
 
 
-static struct device_driver  palmld_wm97xx_driver = {
-    .name = "wm97xx-touchscreen",
-    .bus = &wm97xx_bus_type,
-    .owner = THIS_MODULE,
-    .probe = palmld_wm97xx_probe,
-    .remove = palmld_wm97xx_remove,
-    .suspend = palmld_wm97xx_suspend,
-    .resume = palmld_wm97xx_resume,
-    .shutdown = palmld_wm97xx_shutdown
+static struct device_driver palmld_wm97xx_driver = {
+    .name	= "wm97xx-touchscreen",
+    .bus	= &wm97xx_bus_type,
+    .owner	= THIS_MODULE,
+    .probe	= palmld_wm97xx_probe,
+    .remove	= palmld_wm97xx_remove,
+    .suspend	= palmld_wm97xx_suspend,
+    .resume	= palmld_wm97xx_resume,
+    .shutdown	= palmld_wm97xx_shutdown
 };
 
 #if defined(CONFIG_APM_EMULATION) || defined(CONFIG_APM_MODULE)


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