[ARM] pxa: 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 <siccegge@cs.fau.de>
Acked-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 2bd33ff7d5fc11201936fdfa4d2b72264c08555c..21d12246c5e1ce2976c0439eaef113bcf9b526a3 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -682,7 +682,6 @@ config SHARPSL_PM
 
 config SHARPSL_PM_MAX1111
        bool
-       depends on !CORGI_SSP_DEPRECATED
        select HWMON
        select SENSORS_MAX1111
 

diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index 582701e5337f351b601ed656c5ef742dbb7a536d..d8c5301294c8e9d235e15d1057f65257114281d4 100644 (file)
--- 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)