diff options
| author | Alexander Shiyan <shc_work@mail.ru> | 2013-07-29 11:27:32 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 15:47:37 -0400 |
| commit | c29782965b428d647742c5f22d9eca7a2d0f820f (patch) | |
| tree | 319b0c0c3bdfb5d641b3726a67e1536e020af6a2 /drivers/tty/serial/max310x.c | |
| parent | cf204a1b54a5fa34d64676313a1cb0119657388d (diff) | |
serial: max310x: Fix dev_pm_ops
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>
Diffstat (limited to 'drivers/tty/serial/max310x.c')
| -rw-r--r-- | drivers/tty/serial/max310x.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c index 4ab5b272a593..b2e707aa603a 100644 --- a/drivers/tty/serial/max310x.c +++ b/drivers/tty/serial/max310x.c | |||
| @@ -991,10 +991,9 @@ static const struct uart_ops max310x_ops = { | |||
| 991 | .verify_port = max310x_verify_port, | 991 | .verify_port = max310x_verify_port, |
| 992 | }; | 992 | }; |
| 993 | 993 | ||
| 994 | static int __maybe_unused max310x_suspend(struct spi_device *spi, | 994 | static int __maybe_unused max310x_suspend(struct device *dev) |
| 995 | pm_message_t state) | ||
| 996 | { | 995 | { |
| 997 | struct max310x_port *s = dev_get_drvdata(&spi->dev); | 996 | struct max310x_port *s = dev_get_drvdata(dev); |
| 998 | int i; | 997 | int i; |
| 999 | 998 | ||
| 1000 | for (i = 0; i < s->uart.nr; i++) { | 999 | for (i = 0; i < s->uart.nr; i++) { |
| @@ -1005,9 +1004,9 @@ static int __maybe_unused max310x_suspend(struct spi_device *spi, | |||
| 1005 | return 0; | 1004 | return 0; |
| 1006 | } | 1005 | } |
| 1007 | 1006 | ||
| 1008 | static int __maybe_unused max310x_resume(struct spi_device *spi) | 1007 | static int __maybe_unused max310x_resume(struct device *dev) |
| 1009 | { | 1008 | { |
| 1010 | struct max310x_port *s = dev_get_drvdata(&spi->dev); | 1009 | struct max310x_port *s = dev_get_drvdata(dev); |
| 1011 | int i; | 1010 | int i; |
| 1012 | 1011 | ||
| 1013 | for (i = 0; i < s->uart.nr; i++) { | 1012 | for (i = 0; i < s->uart.nr; i++) { |