diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-25 15:46:39 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-25 20:06:40 -0500 |
commit | 261119f727a4c7cfc001eed0d94cea70e662433a (patch) | |
tree | 8349822e765dca55c7793e290c2f5ccada338ef4 /drivers/tty | |
parent | 962b0a884a4d18326596e0434d813c17d7f688ef (diff) |
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 'drivers/tty')
-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 088907053ea1..12c95cc64c00 100644 --- a/drivers/tty/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c | |||
@@ -247,32 +247,6 @@ static int of_platform_serial_remove(struct platform_device *ofdev) | |||
247 | return 0; | 247 | return 0; |
248 | } | 248 | } |
249 | 249 | ||
250 | #ifdef CONFIG_PM_SLEEP | ||
251 | static int of_serial_suspend(struct device *dev) | ||
252 | { | ||
253 | struct of_serial_info *info = dev_get_drvdata(dev); | ||
254 | |||
255 | serial8250_suspend_port(info->line); | ||
256 | if (info->clk) | ||
257 | clk_disable_unprepare(info->clk); | ||
258 | |||
259 | return 0; | ||
260 | } | ||
261 | |||
262 | static int of_serial_resume(struct device *dev) | ||
263 | { | ||
264 | struct of_serial_info *info = dev_get_drvdata(dev); | ||
265 | |||
266 | if (info->clk) | ||
267 | clk_prepare_enable(info->clk); | ||
268 | |||
269 | serial8250_resume_port(info->line); | ||
270 | |||
271 | return 0; | ||
272 | } | ||
273 | #endif | ||
274 | static SIMPLE_DEV_PM_OPS(of_serial_pm_ops, of_serial_suspend, of_serial_resume); | ||
275 | |||
276 | /* | 250 | /* |
277 | * A few common types, add more as needed. | 251 | * A few common types, add more as needed. |
278 | */ | 252 | */ |
@@ -305,7 +279,6 @@ static struct platform_driver of_platform_serial_driver = { | |||
305 | .name = "of_serial", | 279 | .name = "of_serial", |
306 | .owner = THIS_MODULE, | 280 | .owner = THIS_MODULE, |
307 | .of_match_table = of_platform_serial_table, | 281 | .of_match_table = of_platform_serial_table, |
308 | .pm = &of_serial_pm_ops, | ||
309 | }, | 282 | }, |
310 | .probe = of_platform_serial_probe, | 283 | .probe = of_platform_serial_probe, |
311 | .remove = of_platform_serial_remove, | 284 | .remove = of_platform_serial_remove, |