Skip to content

Commit

Permalink
tty: serial: samsung.c remove legacy PM code.
Browse files Browse the repository at this point in the history
This patch "modernize" tty/serial/samsung.c to use non-legacy code for
suspend/resume.

Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: KyungMin Park <kyungmin.park@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
MyungJoo Ham authored and Greg Kroah-Hartman committed Jul 1, 2011
1 parent f2eb3cd commit aef7fe5
Showing 1 changed file with 14 additions and 13 deletions.
27 changes: 14 additions & 13 deletions drivers/tty/serial/samsung.c
Original file line number Diff line number Diff line change
Expand Up @@ -1194,22 +1194,20 @@ int __devexit s3c24xx_serial_remove(struct platform_device *dev)
EXPORT_SYMBOL_GPL(s3c24xx_serial_remove);

/* UART power management code */

#ifdef CONFIG_PM

static int s3c24xx_serial_suspend(struct platform_device *dev, pm_message_t state)
#ifdef CONFIG_PM_SLEEP
static int s3c24xx_serial_suspend(struct device *dev)
{
struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
struct uart_port *port = s3c24xx_dev_to_port(dev);

if (port)
uart_suspend_port(&s3c24xx_uart_drv, port);

return 0;
}

static int s3c24xx_serial_resume(struct platform_device *dev)
static int s3c24xx_serial_resume(struct device *dev)
{
struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
struct uart_port *port = s3c24xx_dev_to_port(dev);
struct s3c24xx_uart_port *ourport = to_ourport(port);

if (port) {
Expand All @@ -1222,17 +1220,20 @@ static int s3c24xx_serial_resume(struct platform_device *dev)

return 0;
}
#endif

static const struct dev_pm_ops s3c24xx_serial_pm_ops = {
.suspend = s3c24xx_serial_suspend,
.resume = s3c24xx_serial_resume,
};
#else /* !CONFIG_PM_SLEEP */
#define s3c24xx_serial_pm_ops NULL
#endif /* CONFIG_PM_SLEEP */

int s3c24xx_serial_init(struct platform_driver *drv,
struct s3c24xx_uart_info *info)
{
dbg("s3c24xx_serial_init(%p,%p)\n", drv, info);

#ifdef CONFIG_PM
drv->suspend = s3c24xx_serial_suspend;
drv->resume = s3c24xx_serial_resume;
#endif
drv->driver.pm = &s3c24xx_serial_pm_ops;

return platform_driver_register(drv);
}
Expand Down

0 comments on commit aef7fe5

Please sign in to comment.