tree 2466679dfe7cc7f9a225705148a8373ea8b2e5b2
parent 591bb3c9303e46945a3b5e14140bf44535e6f70e
author Pavel Machek <[EMAIL PROTECTED]> Tue Apr 12 08:26:04 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:26:04 2005
[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]>
amba-pl010.c | 2 +-
imx.c | 2 +-
pmac_zilog.c | 2 +-
pxa.c | 2 +-
s3c2410.c | 2 +-
sa1100.c | 2 +-
serial_txx9.c | 2 +-
vr41xx_siu.c | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
Index: drivers/serial/amba-pl010.c
===================================================================
--- 108197a601082743b4ab22a1b036e9e0bb764b8c/drivers/serial/amba-pl010.c
(mode:100644 sha1:4566beac47e88e7c674c12a467b3a6b0fde188ac)
+++ 2466679dfe7cc7f9a225705148a8373ea8b2e5b2/drivers/serial/amba-pl010.c
(mode:100644 sha1:ced710ff830806f6789bd0ccda132a5ecbc11371)
@@ -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
===================================================================
--- 108197a601082743b4ab22a1b036e9e0bb764b8c/drivers/serial/imx.c (mode:100644
sha1:543189e5ef1e9941d18e472e82f5b060c1000aa8)
+++ 2466679dfe7cc7f9a225705148a8373ea8b2e5b2/drivers/serial/imx.c (mode:100644
sha1:cdb7fcad32c9359dbe51f6d62f04bcb48bd21ec5)
@@ -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
===================================================================
--- 108197a601082743b4ab22a1b036e9e0bb764b8c/drivers/serial/pmac_zilog.c
(mode:100644 sha1:904238770fd5b28553aa91c560d6d92cd8cf30a3)
+++ 2466679dfe7cc7f9a225705148a8373ea8b2e5b2/drivers/serial/pmac_zilog.c
(mode:100644 sha1:04dcd4c03a12cd8a1ca6ba42ab41efe1a953a9df)
@@ -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
===================================================================
--- 108197a601082743b4ab22a1b036e9e0bb764b8c/drivers/serial/pxa.c (mode:100644
sha1:eb8313cc721be115d031f717f8ef4d629c3330ad)
+++ 2466679dfe7cc7f9a225705148a8373ea8b2e5b2/drivers/serial/pxa.c (mode:100644
sha1:3227fb9431c987851e0b8e51c82cff06d7d3c8a8)
@@ -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
===================================================================
--- 108197a601082743b4ab22a1b036e9e0bb764b8c/drivers/serial/s3c2410.c
(mode:100644 sha1:b9aaf59d0ac613551d11cce7fe12faa2a7f53391)
+++ 2466679dfe7cc7f9a225705148a8373ea8b2e5b2/drivers/serial/s3c2410.c
(mode:100644 sha1:55f4fe592d4d1ebe96e734f534a74a4549cfefc6)
@@ -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
===================================================================
--- 108197a601082743b4ab22a1b036e9e0bb764b8c/drivers/serial/sa1100.c
(mode:100644 sha1:a40ea6f379de0da078616487bd77f12787a7d6db)
+++ 2466679dfe7cc7f9a225705148a8373ea8b2e5b2/drivers/serial/sa1100.c
(mode:100644 sha1:c88a9f55f143f966a93f8db688171fad3eeb433b)
@@ -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
===================================================================
--- 108197a601082743b4ab22a1b036e9e0bb764b8c/drivers/serial/serial_txx9.c
(mode:100644 sha1:b2e0874e25095e036d3912faf713ddc46f3b6b70)
+++ 2466679dfe7cc7f9a225705148a8373ea8b2e5b2/drivers/serial/serial_txx9.c
(mode:100644 sha1:99d2eb0696df25e2843500abcfef730192ee29d5)
@@ -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
===================================================================
--- 108197a601082743b4ab22a1b036e9e0bb764b8c/drivers/serial/vr41xx_siu.c
(mode:100644 sha1:6f78784bc5a63faad346c0e88f8368646a4e70b2)
+++ 2466679dfe7cc7f9a225705148a8373ea8b2e5b2/drivers/serial/vr41xx_siu.c
(mode:100644 sha1:0e5705f62e62cac8cb8cdaed45acc4a12dadecd7)
@@ -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
