diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-03-28 16:18:52 +0100 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2009-06-11 16:20:42 +0200 |
| commit | d48898a3c88c1f36a66a8d4e3e45843c3171c548 (patch) | |
| tree | 149a8f83108a1b8528380ae8630b200ef29e6594 /arch/arm/mach-pxa/corgi_pm.c | |
| parent | [ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific (diff) | |
| download | linux-d48898a3c88c1f36a66a8d4e3e45843c3171c548.tar.xz linux-d48898a3c88c1f36a66a8d4e3e45843c3171c548.zip | |
[ARM] pxa/sharpsl_pm: merge pxa-specific code into generic one
As pxa now is the only user of sharpsl_pm we can drop several startup
functions into generic code thus dropping several global functions.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/corgi_pm.c')
| -rw-r--r-- | arch/arm/mach-pxa/corgi_pm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c index 7f04b3a761d1..a093282fe4db 100644 --- a/arch/arm/mach-pxa/corgi_pm.c +++ b/arch/arm/mach-pxa/corgi_pm.c @@ -41,7 +41,6 @@ static void corgi_charger_init(void) pxa_gpio_mode(CORGI_GPIO_CHRG_ON | GPIO_OUT); pxa_gpio_mode(CORGI_GPIO_CHRG_UKN | GPIO_OUT); pxa_gpio_mode(CORGI_GPIO_KEY_INT | GPIO_IN); - sharpsl_pm_pxa_init(); } static void corgi_measure_temp(int on) @@ -191,7 +190,7 @@ unsigned long corgipm_read_devdata(int type) static struct sharpsl_charger_machinfo corgi_pm_machinfo = { .init = corgi_charger_init, - .exit = sharpsl_pm_pxa_remove, + .exit = NULL, .gpio_batlock = CORGI_GPIO_BAT_COVER, .gpio_acin = CORGI_GPIO_AC_IN, .gpio_batfull = CORGI_GPIO_CHRG_FULL, |