diff options
author | Andy Green <andy@openmoko.com> | 2008-11-19 17:10:03 +0000 |
---|---|---|
committer | Andy Green <andy@openmoko.com> | 2008-11-19 17:10:03 +0000 |
commit | b21979f3e68b8258e786daa0092851a1a11651c4 (patch) | |
tree | 323dfaa4ba684f9d704e0c3685cc87e9a3702992 /arch/arm/plat-s3c24xx/neo1973_pm_gsm.c | |
parent | 1d0cfc86528622f1b831544f72de827da9c9b97f (diff) |
remove-s3c24xx-serial-resume-dep-gsm-pm.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'arch/arm/plat-s3c24xx/neo1973_pm_gsm.c')
-rw-r--r-- | arch/arm/plat-s3c24xx/neo1973_pm_gsm.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c index de839394e77..69729c40174 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c @@ -18,7 +18,6 @@ #include <linux/console.h> #include <linux/errno.h> #include <linux/interrupt.h> -#include <linux/resume-dependency.h> #include <asm/gpio.h> #include <asm/mach-types.h> @@ -31,8 +30,6 @@ #include <asm/arch/regs-gpioj.h> #endif -extern void s3c24xx_serial_register_resume_dependency(struct resume_dependency * - resume_dependency, int uart_index); struct gta01pm_priv { int gpio_ngsm_en; @@ -41,8 +38,6 @@ struct gta01pm_priv { struct console *con; }; -struct resume_dependency resume_dep_gsm_uart; - static struct gta01pm_priv gta01_gsm; static struct console *find_s3c24xx_console(void) @@ -198,22 +193,11 @@ static int gta01_gsm_suspend(struct platform_device *pdev, pm_message_t state) if (machine_is_neo1973_gta02()) s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 1); - /* register our resume dependency on the appropriate UART being up */ - resume_dep_gsm_uart.callback = gta01_gsm_resume; - resume_dep_gsm_uart.context = (void *)pdev; - - s3c24xx_serial_register_resume_dependency(&resume_dep_gsm_uart, 0); - return 0; } static int gta01_gsm_resume(struct platform_device *pdev) { - if (resume_dep_gsm_uart.called_flag != 1) - return 0; - - resume_dep_gsm_uart.called_flag++; /* only run once */ - /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we * don't need to do much here. */ @@ -299,8 +283,6 @@ static int __init gta01_gsm_probe(struct platform_device *pdev) if (machine_is_neo1973_gta02()) s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 1); - init_resume_dependency_list(&resume_dep_gsm_uart); - return sysfs_create_group(&pdev->dev.kobj, >a01_gsm_attr_group); } |