aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/serial/amba-pl010.c2
-rw-r--r--drivers/serial/imx.c2
-rw-r--r--drivers/serial/pmac_zilog.c2
-rw-r--r--drivers/serial/pxa.c2
-rw-r--r--drivers/serial/s3c2410.c2
-rw-r--r--drivers/serial/sa1100.c2
-rw-r--r--drivers/serial/serial_txx9.c2
-rw-r--r--drivers/serial/vr41xx_siu.c2
8 files changed, 8 insertions, 8 deletions
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
index ac57fdc8711b..484f6fb900b5 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)
772 return 0; 772 return 0;
773} 773}
774 774
775static int pl010_suspend(struct amba_device *dev, u32 state) 775static int pl010_suspend(struct amba_device *dev, pm_message_t state)
776{ 776{
777 struct uart_amba_port *uap = amba_get_drvdata(dev); 777 struct uart_amba_port *uap = amba_get_drvdata(dev);
778 778
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index d273134f9e6c..c682c6308cde 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -825,7 +825,7 @@ static struct uart_driver imx_reg = {
825 .cons = IMX_CONSOLE, 825 .cons = IMX_CONSOLE,
826}; 826};
827 827
828static int serial_imx_suspend(struct device *_dev, u32 state, u32 level) 828static int serial_imx_suspend(struct device *_dev, pm_message_t state, u32 level)
829{ 829{
830 struct imx_port *sport = dev_get_drvdata(_dev); 830 struct imx_port *sport = dev_get_drvdata(_dev);
831 831
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 0a6b9f0ed23f..85abd8a045e0 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)
1590} 1590}
1591 1591
1592 1592
1593static int pmz_suspend(struct macio_dev *mdev, u32 pm_state) 1593static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state)
1594{ 1594{
1595 struct uart_pmac_port *uap = dev_get_drvdata(&mdev->ofdev.dev); 1595 struct uart_pmac_port *uap = dev_get_drvdata(&mdev->ofdev.dev);
1596 struct uart_state *state; 1596 struct uart_state *state;
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index 68b25b2c26b1..51d8a49f4477 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -797,7 +797,7 @@ static struct uart_driver serial_pxa_reg = {
797 .cons = PXA_CONSOLE, 797 .cons = PXA_CONSOLE,
798}; 798};
799 799
800static int serial_pxa_suspend(struct device *_dev, u32 state, u32 level) 800static int serial_pxa_suspend(struct device *_dev, pm_message_t state, u32 level)
801{ 801{
802 struct uart_pxa_port *sport = dev_get_drvdata(_dev); 802 struct uart_pxa_port *sport = dev_get_drvdata(_dev);
803 803
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index ffc61389614b..bd6782aeb831 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -1156,7 +1156,7 @@ int s3c24xx_serial_remove(struct device *_dev)
1156 1156
1157#ifdef CONFIG_PM 1157#ifdef CONFIG_PM
1158 1158
1159int s3c24xx_serial_suspend(struct device *dev, u32 state, u32 level) 1159int s3c24xx_serial_suspend(struct device *dev, pm_message_t state, u32 level)
1160{ 1160{
1161 struct uart_port *port = s3c24xx_dev_to_port(dev); 1161 struct uart_port *port = s3c24xx_dev_to_port(dev);
1162 1162
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c
index 85f0af452f95..086065210d1e 100644
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
@@ -854,7 +854,7 @@ static struct uart_driver sa1100_reg = {
854 .cons = SA1100_CONSOLE, 854 .cons = SA1100_CONSOLE,
855}; 855};
856 856
857static int sa1100_serial_suspend(struct device *_dev, u32 state, u32 level) 857static int sa1100_serial_suspend(struct device *_dev, pm_message_t state, u32 level)
858{ 858{
859 struct sa1100_port *sport = dev_get_drvdata(_dev); 859 struct sa1100_port *sport = dev_get_drvdata(_dev);
860 860
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c
index dfc987301f17..37b2ef297cbe 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)
1095 } 1095 }
1096} 1096}
1097 1097
1098static int pciserial_txx9_suspend_one(struct pci_dev *dev, u32 state) 1098static int pciserial_txx9_suspend_one(struct pci_dev *dev, pm_message_t state)
1099{ 1099{
1100 int line = (int)(long)pci_get_drvdata(dev); 1100 int line = (int)(long)pci_get_drvdata(dev);
1101 1101
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c
index ebc59c27a85c..307886199f2f 100644
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
@@ -1026,7 +1026,7 @@ static int siu_remove(struct device *dev)
1026 return 0; 1026 return 0;
1027} 1027}
1028 1028
1029static int siu_suspend(struct device *dev, u32 state, u32 level) 1029static int siu_suspend(struct device *dev, pm_message_t state, u32 level)
1030{ 1030{
1031 struct uart_port *port; 1031 struct uart_port *port;
1032 int i; 1032 int i;