Commit 0370affe authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a4ffad5b
...@@ -772,7 +772,7 @@ static int pl010_remove(struct amba_device *dev) ...@@ -772,7 +772,7 @@ static int pl010_remove(struct amba_device *dev)
return 0; 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); struct uart_amba_port *uap = amba_get_drvdata(dev);
......
...@@ -825,7 +825,7 @@ static struct uart_driver imx_reg = { ...@@ -825,7 +825,7 @@ static struct uart_driver imx_reg = {
.cons = IMX_CONSOLE, .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); struct imx_port *sport = dev_get_drvdata(_dev);
......
...@@ -1590,7 +1590,7 @@ static int pmz_detach(struct macio_dev *mdev) ...@@ -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_pmac_port *uap = dev_get_drvdata(&mdev->ofdev.dev);
struct uart_state *state; struct uart_state *state;
......
...@@ -797,7 +797,7 @@ static struct uart_driver serial_pxa_reg = { ...@@ -797,7 +797,7 @@ static struct uart_driver serial_pxa_reg = {
.cons = PXA_CONSOLE, .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); struct uart_pxa_port *sport = dev_get_drvdata(_dev);
......
...@@ -1156,7 +1156,7 @@ int s3c24xx_serial_remove(struct device *_dev) ...@@ -1156,7 +1156,7 @@ int s3c24xx_serial_remove(struct device *_dev)
#ifdef CONFIG_PM #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); struct uart_port *port = s3c24xx_dev_to_port(dev);
......
...@@ -854,7 +854,7 @@ static struct uart_driver sa1100_reg = { ...@@ -854,7 +854,7 @@ static struct uart_driver sa1100_reg = {
.cons = SA1100_CONSOLE, .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); struct sa1100_port *sport = dev_get_drvdata(_dev);
......
...@@ -1095,7 +1095,7 @@ static void __devexit pciserial_txx9_remove_one(struct pci_dev *dev) ...@@ -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); int line = (int)(long)pci_get_drvdata(dev);
......
...@@ -1026,7 +1026,7 @@ static int siu_remove(struct device *dev) ...@@ -1026,7 +1026,7 @@ static int siu_remove(struct device *dev)
return 0; 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; struct uart_port *port;
int i; int i;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment