[Hackndev-commit] SF.net SVN: hackndev: [1274] linux4palm/linux/trunk/arch/arm/mach-pxa/ palmtx/palmtx_battery.c

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

Revision: 1274
          http://hackndev.svn.sourceforge.net/hackndev/?rev=1274&view=rev
Author:   marex_z71
Date:     2007-08-25 21:37:17 -0700 (Sat, 25 Aug 2007)

Log Message:
-----------
PalmTX: remove bloated code from palmtx_battery

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c	2007-08-26 01:16:28 UTC (rev 1273)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c	2007-08-26 04:37:17 UTC (rev 1274)
@@ -100,7 +100,7 @@
 int palmtx_battery_get_status(struct power_supply *b)
 {
         int ac_connected  = GET_PALMTX_GPIO(POWER_DETECT);
-        int usb_connected = !GET_PALMTX_GPIO(USB_DETECT);
+        int usb_connected = !GET_PALMTX_GPIO(USB_DETECT_N);
 
         if ( (ac_connected || usb_connected) &&
         ( ( bat.current_voltage > bat.previous_voltage ) ||
@@ -208,13 +208,7 @@
 
 static int palmtx_ac_is_connected (void){
 	/* when charger is plugged in, then status is ONLINE */
-	int ret = ((GET_GPIO(GPIO_NR_PALMTX_POWER_DETECT))||(!GET_GPIO(GPIO_NR_PALMTX_USB_DETECT)));;
-	if (ret) 
-		ret = 1;
-	else 
-		ret = 0;
-
-	return ret;
+	return GET_PALMTX_GPIO(POWER_DETECT)||(!GET_PALMTX_GPIO(USB_DETECT_N));
 }
 
 #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.