Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

drivers/serial/amba-pl010.c

+1 −1
Original line number Diff line number Diff line
@@ -772,7 +772,7 @@ static int pl010_remove(struct amba_device *dev) 
	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);

drivers/serial/imx.c

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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_state *state;

drivers/serial/pxa.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -1156,7 +1156,7 @@ int s3c24xx_serial_remove(struct device *_dev) 


#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);