2010-06-30 16:02:00

by Christoph Egger

Subject: [PATCH 25/33] Removing dead CORGI_SSP_DEPRECATED

CORGI_SSP_DEPRECATED doesn't exist in Kconfig, therefore removing all
references for it from the source code.

Signed-off-by: Christoph Egger <[email protected]>
---
arch/arm/mach-pxa/sharpsl_pm.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index 582701e..d8c5301 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -180,17 +180,12 @@ int sharpsl_pm_pxa_read_max1111(int channel)
if (machine_is_tosa())
return 0;

-#ifdef CONFIG_CORGI_SSP_DEPRECATED
- return corgi_ssp_max1111_get((channel << MAXCTRL_SEL_SH) | MAXCTRL_PD0 | MAXCTRL_PD1
- | MAXCTRL_SGL | MAXCTRL_UNI | MAXCTRL_STR);
-#else
extern int max1111_read_channel(int);

/* max1111 accepts channels from 0-3, however,
* it is encoded from 0-7 here in the code.
*/
return max1111_read_channel(channel >> 1);
-#endif
}

static int get_percentage(int voltage)
--
1.7.0.4

2010-07-01 10:01:54

by Kristoffer Ericson

Subject: Re: [PATCH 25/33] Removing dead CORGI_SSP_DEPRECATED

On Wed, Jun 30, 2010 at 06:01:56PM +0200, Christoph Egger wrote:
> CORGI_SSP_DEPRECATED doesn't exist in Kconfig, therefore removing all
> references for it from the source code.
>
> Signed-off-by: Christoph Egger <[email protected]>

Cant see anything wrong with this.

acked-by: Kristoffer Ericson <[email protected]>

> ---
> arch/arm/mach-pxa/sharpsl_pm.c | 5 -----
> 1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
> index 582701e..d8c5301 100644
> --- a/arch/arm/mach-pxa/sharpsl_pm.c
> +++ b/arch/arm/mach-pxa/sharpsl_pm.c
> @@ -180,17 +180,12 @@ int sharpsl_pm_pxa_read_max1111(int channel)
> if (machine_is_tosa())
> return 0;
>
> -#ifdef CONFIG_CORGI_SSP_DEPRECATED
> - return corgi_ssp_max1111_get((channel << MAXCTRL_SEL_SH) | MAXCTRL_PD0 | MAXCTRL_PD1
> - | MAXCTRL_SGL | MAXCTRL_UNI | MAXCTRL_STR);
> -#else
> extern int max1111_read_channel(int);
>
> /* max1111 accepts channels from 0-3, however,
> * it is encoded from 0-7 here in the code.
> */
> return max1111_read_channel(channel >> 1);
> -#endif
> }
>
> static int get_percentage(int voltage)
> --
> 1.7.0.4

2010-07-04 15:56:52

by Eric Miao

Subject: Re: [PATCH 25/33] Removing dead CORGI_SSP_DEPRECATED

On Thu, Jul 1, 2010 at 5:58 PM, Kristoffer Ericson
<[email protected]> wrote:
> On Wed, Jun 30, 2010 at 06:01:56PM +0200, Christoph Egger wrote:
>> CORGI_SSP_DEPRECATED doesn't exist in Kconfig, therefore removing all
>> references for it from the source code.
>>
>> Signed-off-by: Christoph Egger <[email protected]>
>
> Cant see anything wrong with this.
>
> acked-by: Kristoffer Ericson <[email protected]>
>

Applied.