diff options
| -rw-r--r-- | drivers/serial/amba-pl010.c | 2 | ||||
| -rw-r--r-- | drivers/serial/imx.c | 2 | ||||
| -rw-r--r-- | drivers/serial/pmac_zilog.c | 2 | ||||
| -rw-r--r-- | drivers/serial/pxa.c | 2 | ||||
| -rw-r--r-- | drivers/serial/s3c2410.c | 2 | ||||
| -rw-r--r-- | drivers/serial/sa1100.c | 2 | ||||
| -rw-r--r-- | drivers/serial/serial_txx9.c | 2 | ||||
| -rw-r--r-- | drivers/serial/vr41xx_siu.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index ac57fdc8711..484f6fb900b 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/serial/amba-pl010.c @@ -772,7 +772,7 @@ static int pl010_remove(struct amba_device *dev) return 0; } -static int pl010_suspend(struct amba_device *dev, u32 state) +static int pl010_suspend(struct amba_device *dev, pm_message_t state) { struct uart_amba_port *uap = amba_get_drvdata(dev); diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index d273134f9e6..c682c6308cd 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c @@ -825,7 +825,7 @@ static struct uart_driver imx_reg = { .cons = IMX_CONSOLE, }; -static int serial_imx_suspend(struct device *_dev, u32 state, u32 level) +static int serial_imx_suspend(struct device *_dev, pm_message_t state, u32 level) { struct imx_port *sport = dev_get_drvdata(_dev); diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index 0a6b9f0ed23..85abd8a045e 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c @@ -1590,7 +1590,7 @@ static int pmz_detach(struct macio_dev *mdev) } -static int pmz_suspend(struct macio_dev *mdev, u32 pm_state) +static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state) { struct uart_pmac_port *uap = dev_get_drvdata(&mdev->ofdev.dev); struct uart_state *state; diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c index 68b25b2c26b..51d8a49f447 100644 --- a/drivers/serial/pxa.c +++ b/drivers/serial/pxa.c @@ -797,7 +797,7 @@ static struct uart_driver serial_pxa_reg = { .cons = PXA_CONSOLE, }; -static int serial_pxa_suspend(struct device *_dev, u32 state, u32 level) +static int serial_pxa_suspend(struct device *_dev, pm_message_t state, u32 level) { struct uart_pxa_port *sport = dev_get_drvdata(_dev); diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index ffc61389614..bd6782aeb83 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/serial/s3c2410.c @@ -1156,7 +1156,7 @@ int s3c24xx_serial_remove(struct device *_dev) #ifdef CONFIG_PM -int s3c24xx_serial_suspend(struct device *dev, u32 state, u32 level) +int s3c24xx_serial_suspend(struct device *dev, pm_message_t state, u32 level) { struct uart_port *port = s3c24xx_dev_to_port(dev); diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c index 85f0af452f9..086065210d1 100644 --- a/drivers/serial/sa1100.c +++ b/drivers/serial/sa1100.c @@ -854,7 +854,7 @@ static struct uart_driver sa1100_reg = { .cons = SA1100_CONSOLE, }; -static int sa1100_serial_suspend(struct device *_dev, u32 state, u32 level) +static int sa1100_serial_suspend(struct device *_dev, pm_message_t state, u32 level) { struct sa1100_port *sport = dev_get_drvdata(_dev); diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c index dfc987301f1..37b2ef297cb 100644 --- a/drivers/serial/serial_txx9.c +++ b/drivers/serial/serial_txx9.c @@ -1095,7 +1095,7 @@ static void __devexit pciserial_txx9_remove_one(struct pci_dev *dev) } } -static int pciserial_txx9_suspend_one(struct pci_dev *dev, u32 state) +static int pciserial_txx9_suspend_one(struct pci_dev *dev, pm_message_t state) { int line = (int)(long)pci_get_drvdata(dev); diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c index ebc59c27a85..307886199f2 100644 --- a/drivers/serial/vr41xx_siu.c +++ b/drivers/serial/vr41xx_siu.c @@ -1026,7 +1026,7 @@ static int siu_remove(struct device *dev) return 0; } -static int siu_suspend(struct device *dev, u32 state, u32 level) +static int siu_suspend(struct device *dev, pm_message_t state, u32 level) { struct uart_port *port; int i; |