[Hackndev-commit] SF.net SVN: hackndev: [992] linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3 /palmt3_battery.c

[<far...@us...>]

Revision: 992
          http://svn.sourceforge.net/hackndev/?rev=992&view=rev
Author:   farcaller
Date:     2007-05-25 11:23:09 -0700 (Fri, 25 May 2007)

Log Message:
-----------
palmt3: cleaned deps of palmt3_battery

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_battery.c

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_battery.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_battery.c	2007-05-25 18:01:27 UTC (rev 991)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_battery.c	2007-05-25 18:23:09 UTC (rev 992)
@@ -95,6 +95,7 @@
 	return ((tps65010_get_chgstatus() & TPS_CHG_AC)?1:0);
 }
 
+#ifdef CONFIG_BATTCHARGE_MONITOR
 static struct battery palmt3_battery = {
 	.name		 = "palmt3_batt",
 	.id		 = "Li-Ion battery",
@@ -116,6 +117,7 @@
 	.id		 = "AC",
 	.get_status	 = palmt3_charger_get_ac_status,
 };
+#endif
 
 /* -------------------------- APM ------------------------------------- */
 static void palmt3_apm_get_power_status(struct apm_power_info *info)
@@ -180,11 +182,11 @@
 static int __init palmt3_battery_init(void)
 {
 	int retval;
-
 	retval = driver_register(&palmt3_battery_driver);
 	if (retval)
 	    return retval;
 
+#ifdef CONFIG_BATTCHARGE_MONITOR
 	retval = battery_class_register(&palmt3_battery);
 	retval = charger_class_register(&palmt3_usb_charger);
 	retval = charger_class_register(&palmt3_ac_charger);
@@ -193,6 +195,7 @@
 	battery_attach_charger(&palmt3_battery, &palmt3_ac_charger);
 
 	battery_update_charge_link(&palmt3_battery);
+#endif
 	if (!retval) {
 #ifdef CONFIG_PM
 	set_apm_get_power_status(palmt3_apm_get_power_status);
@@ -203,6 +206,7 @@
 
 static void __exit palmt3_battery_exit(void)
 {
+#ifdef CONFIG_BATTCHARGE_MONITOR
 	battery_remove_charger(0, &palmt3_ac_charger);
 	battery_remove_charger(0, &palmt3_usb_charger);
 
@@ -210,6 +214,7 @@
 	charger_class_unregister(&palmt3_ac_charger);
 	battery_class_unregister(&palmt3_battery);
 	driver_unregister(&palmt3_battery_driver);
+#endif
 }
 
 module_init(palmt3_battery_init);


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