From: <mar...@us...> - 2007-07-06 08:56:47
|
Revision: 1108 http://svn.sourceforge.net/hackndev/?rev=1108&view=rev Author: marex_z71 Date: 2007-07-06 01:56:42 -0700 (Fri, 06 Jul 2007) Log Message: ----------- PalmLD, PalmTX, PalmZ72, PalmT5: drop some useless ifdefs from battery driver Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_battery.c linux4palm/linux/trunk/arch/arm/mach-pxa/palmt5/palmt5_battery.c linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_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-07-05 18:20:31 UTC (rev 1107) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_battery.c 2007-07-06 08:56:42 UTC (rev 1108) @@ -247,7 +247,6 @@ /* register battery to APM layer */ bat.battery_registered = 0; -#ifdef CONFIG_POWER_SUPPLY if(power_supply_register(NULL, &palmld_battery)) { printk(KERN_ERR "palmld_ac97_probe: could not register battery class\n"); } @@ -255,7 +254,6 @@ bat.battery_registered = 1; printk("Battery registered\n"); } -#endif #if defined(CONFIG_APM_EMULATION) || defined(CONFIG_APM_MODULE) apm_get_power_status_orig = apm_get_power_status; apm_get_power_status = palmld_apm_get_power_status; @@ -272,9 +270,7 @@ static void __exit palmld_wm97xx_exit(void) { /* TODO - recover APM callback to original state */ -#ifdef CONFIG_POWER_SUPPLY power_supply_unregister(&palmld_battery); -#endif driver_unregister(&palmld_wm97xx_driver); } Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmt5/palmt5_battery.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmt5/palmt5_battery.c 2007-07-05 18:20:31 UTC (rev 1107) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmt5/palmt5_battery.c 2007-07-06 08:56:42 UTC (rev 1108) @@ -257,7 +257,6 @@ /* register battery to APM layer */ bat.battery_registered = 0; -#ifdef CONFIG_POWER_SUPPLY if(power_supply_register(NULL, &palmt5_battery)) { printk(KERN_ERR "palmt5_ac97_probe: could not register battery class\n"); } @@ -265,7 +264,6 @@ bat.battery_registered = 1; printk("Battery registered\n"); } -#endif #if defined(CONFIG_APM_EMULATION) || defined(CONFIG_APM_MODULE) apm_get_power_status_orig = apm_get_power_status; apm_get_power_status = palmt5_apm_get_power_status; @@ -282,9 +280,7 @@ static void __exit palmt5_wm97xx_exit(void) { /* TODO - recover APM callback to original state */ -#ifdef CONFIG_POWER_SUPPLY power_supply_unregister(&palmt5_battery); -#endif driver_unregister(&palmt5_wm97xx_driver); } Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c 2007-07-05 18:20:31 UTC (rev 1107) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmtx_battery.c 2007-07-06 08:56:42 UTC (rev 1108) @@ -262,7 +262,6 @@ /* register battery to APM layer */ bat.battery_registered = 0; -#ifdef CONFIG_POWER_SUPPLY if(power_supply_register(NULL, &palmtx_battery)) { printk(KERN_ERR "palmtx_ac97_probe: could not register battery class\n"); } @@ -270,7 +269,6 @@ bat.battery_registered = 1; printk("Battery registered\n"); } -#endif #if defined(CONFIG_APM_EMULATION) || defined(CONFIG_APM_MODULE) apm_get_power_status_orig = apm_get_power_status; apm_get_power_status = palmtx_apm_get_power_status; @@ -287,9 +285,7 @@ static void __exit palmtx_wm97xx_exit(void) { /* TODO - recover APM callback to original state */ -#ifdef CONFIG_POWER_SUPPLY power_supply_unregister(&palmtx_battery); -#endif driver_unregister(&palmtx_wm97xx_driver); } Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_battery.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_battery.c 2007-07-05 18:20:31 UTC (rev 1107) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_battery.c 2007-07-06 08:56:42 UTC (rev 1108) @@ -262,7 +262,6 @@ /* register battery to APM layer */ bat.battery_registered = 0; -#ifdef CONFIG_POWER_SUPPLY if(power_supply_register(NULL, &palmz72_battery)) { printk(KERN_ERR "palmz72_ac97_probe: could not register battery class\n"); } @@ -270,7 +269,6 @@ bat.battery_registered = 1; printk("Battery registered\n"); } -#endif #if defined(CONFIG_APM_EMULATION) || defined(CONFIG_APM_MODULE) apm_get_power_status_orig = apm_get_power_status; apm_get_power_status = palmz72_apm_get_power_status; @@ -287,9 +285,7 @@ static void __exit palmz72_wm97xx_exit(void) { /* TODO - recover APM callback to original state */ -#ifdef CONFIG_POWER_SUPPLY power_supply_unregister(&palmz72_battery); -#endif driver_unregister(&palmz72_wm97xx_driver); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |