Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f93840d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents 4742eb3d a5e9ab29

drivers/tty/serial/of_serial.c

+0 −27
Original line number Diff line number Diff line
@@ -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,