fix u32 vs. pm_message_t in drivers/
Subsystems (3)
PATCH 118/198 fix u32 vs. pm_message_t in drivers/
From: Pavel Machek <[email protected]>
-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]>
---
25-akpm/drivers/serial/amba-pl010.c | 2 +- 25-akpm/drivers/serial/imx.c | 2 +- 25-akpm/drivers/serial/pmac_zilog.c | 2 +- 25-akpm/drivers/serial/pxa.c | 2 +- 25-akpm/drivers/serial/s3c2410.c | 2 +- 25-akpm/drivers/serial/sa1100.c | 2 +- 25-akpm/drivers/serial/serial_txx9.c | 2 +- 25-akpm/drivers/serial/vr41xx_siu.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-)
drivers/serial/amba-pl010.c renamed from drivers/serial/amba-pl010.c~fix-u32-vs-pm_message_t-in-drivers +1 -1
@@ -772,7 +772,7 @@ static int pl010_remove(struct amba_devireturn 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);
drivers/serial/imx.c renamed from drivers/serial/imx.c~fix-u32-vs-pm_message_t-in-drivers +1 -1
@@ -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);
drivers/serial/pmac_zilog.c renamed from drivers/serial/pmac_zilog.c~fix-u32-vs-pm_message_t-in-drivers +1 -1
@@ -1590,7 +1590,7 @@ static int pmz_detach(struct macio_dev * } -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;
drivers/serial/pxa.c renamed from drivers/serial/pxa.c~fix-u32-vs-pm_message_t-in-drivers +1 -1
@@ -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);
drivers/serial/s3c2410.c renamed from drivers/serial/s3c2410.c~fix-u32-vs-pm_message_t-in-drivers +1 -1
@@ -1156,7 +1156,7 @@ int s3c24xx_serial_remove(struct device#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);
drivers/serial/sa1100.c renamed from drivers/serial/sa1100.c~fix-u32-vs-pm_message_t-in-drivers +1 -1
@@ -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);
drivers/serial/serial_txx9.c renamed from drivers/serial/serial_txx9.c~fix-u32-vs-pm_message_t-in-drivers +1 -1
@@ -1095,7 +1095,7 @@ static void __devexit pciserial_txx9_rem } } -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);
drivers/serial/vr41xx_siu.c renamed from drivers/serial/vr41xx_siu.c~fix-u32-vs-pm_message_t-in-drivers +1 -1
@@ -1026,7 +1026,7 @@ static int siu_remove(struct device *devreturn 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;
_