serial: max310x: Fix dev_pm_ops
authorAlexander Shiyan <shc_work@mail.ru>
Mon, 29 Jul 2013 15:27:32 +0000 (19:27 +0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 29 Jul 2013 19:47:37 +0000 (12:47 -0700)
This patch fixes wrong dev_pm_ops which caused by commit:
serial: max310x: Driver rework.

  CC      drivers/tty/serial/max310x.o
  LD      drivers/video/fb.o
  CC      drivers/w1/slaves/w1_ds2433.o
  CC      drivers/w1/slaves/w1_ds2760.o
  CC      drivers/xen/balloon.o
  CC      drivers/video/backlight/adp8870_bl.o
drivers/tty/serial/max310x.c:1292:8: warning: initialization from incompatible pointer type [enabled by default]
drivers/tty/serial/max310x.c:1292:8: warning: (near initialization for 'max310x_pm_ops.suspend') [enabled by default]
drivers/tty/serial/max310x.c:1292:8: warning: initialization from incompatible pointer type [enabled by default]
drivers/tty/serial/max310x.c:1292:8: warning: (near initialization for 'max310x_pm_ops.resume') [enabled by default]
drivers/tty/serial/max310x.c:1292:8: warning: initialization from incompatible pointer type [enabled by default]
drivers/tty/serial/max310x.c:1292:8: warning: (near initialization for 'max310x_pm_ops.freeze') [enabled by default]
drivers/tty/serial/max310x.c:1292:8: warning: initialization from incompatible pointer type [enabled by default]
drivers/tty/serial/max310x.c:1292:8: warning: (near initialization for 'max310x_pm_ops.thaw') [enabled by default]
drivers/tty/serial/max310x.c:1292:8: warning: initialization from incompatible pointer type [enabled by default]
drivers/tty/serial/max310x.c:1292:8: warning: (near initialization for 'max310x_pm_ops.poweroff') [enabled by default]
drivers/tty/serial/max310x.c:1292:8: warning: initialization from incompatible pointer type [enabled by default]
drivers/tty/serial/max310x.c:1292:8: warning: (near initialization for 'max310x_pm_ops.restore') [enabled by default]

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/max310x.c

index 4ab5b272a593e37320ab5f6e10b0937a207bb904..b2e707aa603a52daeff7762bf81a7e82397fc831 100644 (file)
@@ -991,10 +991,9 @@ static const struct uart_ops max310x_ops = {
        .verify_port    = max310x_verify_port,
 };
 
-static int __maybe_unused max310x_suspend(struct spi_device *spi,
-                                         pm_message_t state)
+static int __maybe_unused max310x_suspend(struct device *dev)
 {
-       struct max310x_port *s = dev_get_drvdata(&spi->dev);
+       struct max310x_port *s = dev_get_drvdata(dev);
        int i;
 
        for (i = 0; i < s->uart.nr; i++) {
@@ -1005,9 +1004,9 @@ static int __maybe_unused max310x_suspend(struct spi_device *spi,
        return 0;
 }
 
-static int __maybe_unused max310x_resume(struct spi_device *spi)
+static int __maybe_unused max310x_resume(struct device *dev)
 {
-       struct max310x_port *s = dev_get_drvdata(&spi->dev);
+       struct max310x_port *s = dev_get_drvdata(dev);
        int i;
 
        for (i = 0; i < s->uart.nr; i++) {