p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TTY/Serial fix for 3.18-rc7 

Here is a single revert for the of-serial driver that resolves a
 reported issue.
 
 This revert has been in linux-next for a while.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iEYEABECAAYFAlR4+KcACgkQMUfUDdst+ykQiwCglYDZ1zGBpqulsviysX5vT1nM
 1ycAnjiZCWWodRGCF0lHyyl/mxtRb6G0
 =NquU
 -----END PGP SIGNATURE-----

Merge tag 'tty-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial fix from Greg KH:
 "Here is a single revert for the of-serial driver that resolves a
  reported issue.

  This revert has been in linux-next for a while"

* tag 'tty-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  Revert "serial: of-serial: add PM suspend/resume support"
This commit is contained in:
Linus Torvalds 2014-11-28 16:03:24 -08:00
parent 4742eb3dad a5e9ab291c
commit 6f93840d56
1 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/tty/serial/of_serial.c
View File

@ -240,32 +240,6 @@ static int of_platform_serial_remove(struct platform_device *ofdev)
return 0; 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. * A few common types, add more as needed.
*/ */
@ -297,7 +271,6 @@ static struct platform_driver of_platform_serial_driver = {
.name = "of_serial", .name = "of_serial",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_match_table = of_platform_serial_table, .of_match_table = of_platform_serial_table,
.pm = &of_serial_pm_ops,
}, },
.probe = of_platform_serial_probe, .probe = of_platform_serial_probe,
.remove = of_platform_serial_remove, .remove = of_platform_serial_remove,