2007-06-04 11:17:40

by Robert P. J. Day

Subject: [PATCH] Remove apparently useless, commented apm_get_battery_status().

Remove the "#if 0"ed definition of apm_get_battery_status().

Signed-off-by: Robert P. J. Day <[email protected]>
Acked-by: Stephen Rothwell <[email protected]>

---

diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index 4112afe..5c6da2b 100644
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -1006,35 +1006,6 @@ static int apm_get_power_status(u_short *status, u_short *bat, u_short *life)
return APM_SUCCESS;
}

-#if 0
-static int apm_get_battery_status(u_short which, u_short *status,
- u_short *bat, u_short *life, u_short *nbat)
-{
- u32 eax;
- u32 ebx;
- u32 ecx;
- u32 edx;
- u32 esi;
-
- if (apm_info.connection_version < 0x0102) {
- /* pretend we only have one battery. */
- if (which != 1)
- return APM_BAD_DEVICE;
- *nbat = 1;
- return apm_get_power_status(status, bat, life);
- }
-
- if (apm_bios_call(APM_FUNC_GET_STATUS, (0x8000 | (which)), 0, &eax,
- &ebx, &ecx, &edx, &esi))
- return (eax >> 8) & 0xff;
- *status = ebx;
- *bat = ecx;
- *life = edx;
- *nbat = esi;
- return APM_SUCCESS;
-}
-#endif
-
/**
* apm_engage_power_management - enable PM on a device
* @device: identity of device
--
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA

http://fsdev.net/wiki/index.php?title=Main_Page
========================================================================

2007-06-05 06:47:19

by Anton Vorontsov

Subject: Re: [PATCH] Remove apparently useless, commented apm_get_battery_status().

On Mon, Jun 04, 2007 at 07:15:58AM -0400, Robert P. J. Day wrote:
>
> Remove the "#if 0"ed definition of apm_get_battery_status().
>
> Signed-off-by: Robert P. J. Day <[email protected]>
> Acked-by: Stephen Rothwell <[email protected]>

Acked-by: Anton Vorontsov <[email protected]>

> ---
>
> diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
> index 4112afe..5c6da2b 100644
> --- a/arch/i386/kernel/apm.c
> +++ b/arch/i386/kernel/apm.c
> @@ -1006,35 +1006,6 @@ static int apm_get_power_status(u_short *status, u_short *bat, u_short *life)
> return APM_SUCCESS;
> }
>
> -#if 0
> -static int apm_get_battery_status(u_short which, u_short *status,
> - u_short *bat, u_short *life, u_short *nbat)
> -{
> - u32 eax;
> - u32 ebx;
> - u32 ecx;
> - u32 edx;
> - u32 esi;
> -
> - if (apm_info.connection_version < 0x0102) {
> - /* pretend we only have one battery. */
> - if (which != 1)
> - return APM_BAD_DEVICE;
> - *nbat = 1;
> - return apm_get_power_status(status, bat, life);
> - }
> -
> - if (apm_bios_call(APM_FUNC_GET_STATUS, (0x8000 | (which)), 0, &eax,
> - &ebx, &ecx, &edx, &esi))
> - return (eax >> 8) & 0xff;
> - *status = ebx;
> - *bat = ecx;
> - *life = edx;
> - *nbat = esi;
> - return APM_SUCCESS;
> -}
> -#endif
> -
> /**
> * apm_engage_power_management - enable PM on a device
> * @device: identity of device
> --
> ========================================================================
> Robert P. J. Day
> Linux Consulting, Training and Annoying Kernel Pedantry
> Waterloo, Ontario, CANADA
>
> http://fsdev.net/wiki/index.php?title=Main_Page
> ========================================================================

--
Anton Vorontsov
email: [email protected]
backup email: [email protected]
irc://irc.freenode.org/bd2