diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-25 12:46:39 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-25 12:46:39 -0800 |
| commit | a5e9ab291c608c62691b9d565104a30d931998bf (patch) | |
| tree | 35b1757b52781c6554bc02ccf4c1a2fb43e904e5 /drivers/tty/serial/of_serial.c | |
| parent | Linux 3.18-rc4 (diff) | |
| download | linux-dev-a5e9ab291c608c62691b9d565104a30d931998bf.tar.xz linux-dev-a5e9ab291c608c62691b9d565104a30d931998bf.zip | |
Revert "serial: of-serial: add PM suspend/resume support"
This reverts commit 2dea53bf57783f243c892e99c10c6921e956aa7e.
Turns out to be broken :(
Cc: Jingchang Lu <jingchang.lu@freescale.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/tty/serial/of_serial.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c index 56982da4a9e9..bf355050eab6 100644 --- a/drivers/tty/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c @@ -240,32 +240,6 @@ static int of_platform_serial_remove(struct platform_device *ofdev) return 0; } -#ifdef CONFIG_PM_SLEEP -static int of_serial_suspend(struct device *dev) -{ - struct of_serial_info *info = dev_get_drvdata(dev); - - serial8250_suspend_port(info->line); - if (info->clk) - clk_disable_unprepare(info->clk); - - return 0; -} - -static int of_serial_resume(struct device *dev) -{ - struct of_serial_info *info = dev_get_drvdata(dev); - - if (info->clk) - clk_prepare_enable(info->clk); - - serial8250_resume_port(info->line); - - return 0; -} -#endif -static SIMPLE_DEV_PM_OPS(of_serial_pm_ops, of_serial_suspend, of_serial_resume); - /* * A few common types, add more as needed. */ @@ -297,7 +271,6 @@ static struct platform_driver of_platform_serial_driver = { .name = "of_serial", .owner = THIS_MODULE, .of_match_table = of_platform_serial_table, - .pm = &of_serial_pm_ops, }, .probe = of_platform_serial_probe, .remove = of_platform_serial_remove, |