tree da7698bc4130e252372d56b7e251453d1eccefe3
parent a4ffad5b77f17bd8ad2a220d6eb0278bc07a5a17
author Pavel Machek <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:35 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:35 -0700
[PATCH] fix u32 vs. pm_message_t in drivers/
-rc2-mm1 still contains few places where u32 and pm_message_t. This fixes
drivers/serial [should change no code].
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
serial/amba-pl010.c | 2 +-
serial/imx.c | 2 +-
serial/pmac_zilog.c | 2 +-
serial/pxa.c | 2 +-
serial/s3c2410.c | 2 +-
serial/sa1100.c | 2 +-
serial/serial_txx9.c | 2 +-
serial/vr41xx_siu.c | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
Index: drivers/serial/amba-pl010.c
===================================================================
--- e49b3cfee49f4e1b0a5fae26c038a8c62e3a8fc1/drivers/serial/amba-pl010.c
(mode:100644 sha1:ac57fdc8711b0c48c4231fad048da355da9ad98e)
+++ da7698bc4130e252372d56b7e251453d1eccefe3/drivers/serial/amba-pl010.c
(mode:100644 sha1:484f6fb900b51feb5a90cb765aa1cd99da951f54)
@@ -772,7 +772,7 @@
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);
Index: drivers/serial/imx.c
===================================================================
--- e49b3cfee49f4e1b0a5fae26c038a8c62e3a8fc1/drivers/serial/imx.c (mode:100644
sha1:d273134f9e6cc9cac5964996109350c191d0eb06)
+++ da7698bc4130e252372d56b7e251453d1eccefe3/drivers/serial/imx.c (mode:100644
sha1:c682c6308cde1067d27ff6201341305e87f4ce6e)
@@ -825,7 +825,7 @@
.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);
Index: drivers/serial/pmac_zilog.c
===================================================================
--- e49b3cfee49f4e1b0a5fae26c038a8c62e3a8fc1/drivers/serial/pmac_zilog.c
(mode:100644 sha1:0a6b9f0ed23ff35c3aaf7452ba7bd3fd1f2f3498)
+++ da7698bc4130e252372d56b7e251453d1eccefe3/drivers/serial/pmac_zilog.c
(mode:100644 sha1:85abd8a045e088cf2c6414aa52cf91fa1c22dba6)
@@ -1590,7 +1590,7 @@
}
-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;
Index: drivers/serial/pxa.c
===================================================================
--- e49b3cfee49f4e1b0a5fae26c038a8c62e3a8fc1/drivers/serial/pxa.c (mode:100644
sha1:68b25b2c26b1c5746c5fe055b3bc2fbed9c67d5d)
+++ da7698bc4130e252372d56b7e251453d1eccefe3/drivers/serial/pxa.c (mode:100644
sha1:51d8a49f4477bb6f23048b361e4ad367ecdb9758)
@@ -797,7 +797,7 @@
.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);
Index: drivers/serial/s3c2410.c
===================================================================
--- e49b3cfee49f4e1b0a5fae26c038a8c62e3a8fc1/drivers/serial/s3c2410.c
(mode:100644 sha1:ffc61389614b62e02cd241e6602f1cc1464298bd)
+++ da7698bc4130e252372d56b7e251453d1eccefe3/drivers/serial/s3c2410.c
(mode:100644 sha1:bd6782aeb8318367d7fb06f42593f5b5a6b5187e)
@@ -1156,7 +1156,7 @@
#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);
Index: drivers/serial/sa1100.c
===================================================================
--- e49b3cfee49f4e1b0a5fae26c038a8c62e3a8fc1/drivers/serial/sa1100.c
(mode:100644 sha1:85f0af452f95a04256b831a115a0b908080c2c1e)
+++ da7698bc4130e252372d56b7e251453d1eccefe3/drivers/serial/sa1100.c
(mode:100644 sha1:086065210d1e07b3cb24a1f41596e282d920ed50)
@@ -854,7 +854,7 @@
.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);
Index: drivers/serial/serial_txx9.c
===================================================================
--- e49b3cfee49f4e1b0a5fae26c038a8c62e3a8fc1/drivers/serial/serial_txx9.c
(mode:100644 sha1:dfc987301f1757654062c9dcf5ab78152cf64430)
+++ da7698bc4130e252372d56b7e251453d1eccefe3/drivers/serial/serial_txx9.c
(mode:100644 sha1:37b2ef297cbec3816b06d2a30ad588a80abbfdd1)
@@ -1095,7 +1095,7 @@
}
}
-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);
Index: drivers/serial/vr41xx_siu.c
===================================================================
--- e49b3cfee49f4e1b0a5fae26c038a8c62e3a8fc1/drivers/serial/vr41xx_siu.c
(mode:100644 sha1:ebc59c27a85cff206aa16ab8ecc7455ea25611c5)
+++ da7698bc4130e252372d56b7e251453d1eccefe3/drivers/serial/vr41xx_siu.c
(mode:100644 sha1:307886199f2f6f1301d6aa240b1f3263e9ec8a90)
@@ -1026,7 +1026,7 @@
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;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
