driver model: PM type conversions in drivers/serial
PATCH 1/1 driver model: PM type conversions in drivers/serial
This fixes PM driver model type checking for drivers/serial. Acked by Pavel Machek.
Signed-off-by Daniel Drake <[email protected]>
drivers/serial/amba-pl010.c +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 +1 -1
@@ -818,7 +818,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/mpc52xx_uart.c +1 -1
@@ -794,7 +794,7 @@ mpc52xx_uart_remove(struct ocp_device *o#ifdef CONFIG_PM static int -mpc52xx_uart_suspend (struct ocp_device *ocp,u32 state) +mpc52xx_uart_suspend (struct ocp_device *ocp,pm_message_t state) {struct uart_port *port = (struct uart_port *)ocp_get_drvdata (ocp);
drivers/serial/pmac_zilog.c +3 -3
@@ -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;
@@ -1661,7 +1661,7 @@ static int pmz_resume(struct macio_dev *if (uap ==NULL )return 0 ; -if (mdev->ofdev.dev.power.power_state ==0 ) +if (mdev->ofdev.dev.power.power_state ==PMSG_ON )return 0 ;pmz_debug ("resume, switching to state 0\n" );
@@ -1714,7 +1714,7 @@ static int pmz_resume(struct macio_dev *pmz_debug ("resume, switching complete\n" ); - mdev->ofdev.dev.power.power_state =0 ; + mdev->ofdev.dev.power.power_state =PMSG_ON ;return 0 ; }
drivers/serial/pxa.c +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 +1 -1
@@ -1135,7 +1135,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 +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 +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);