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

Commit e36d394d authored by Richard Purdie's avatar Richard Purdie Committed by Linus Torvalds
Browse files

[PATCH] Fix up some pm_message_t types 



Fix up some pm_message_t types

Signed-Off-By: default avatarRichard Purdie <rpurdie@rpsys.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1f87b1e6

arch/arm/common/locomo.c

+1 −1
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ struct locomo_save_data { 
	u16	LCM_SPIMD;

};



static int locomo_suspend(struct device *dev, u32 pm_message_t, u32 level)

static int locomo_suspend(struct device *dev, pm_message_t state, u32 level)

{

	struct locomo *lchip = dev_get_drvdata(dev);

	struct locomo_save_data *save;

arch/ppc/syslib/open_pic2.c

+1 −1
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ static void openpic2_cached_disable_irq(u_int irq) 
 * we need something better to deal with that... Maybe switch to S1 for

 * cpufreq changes

 */

int openpic2_suspend(struct sys_device *sysdev, u32 state)

int openpic2_suspend(struct sys_device *sysdev, pm_message_t state)

{

	int	i;

	unsigned long flags;

drivers/serial/mpc52xx_uart.c

+1 −1
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ mpc52xx_uart_remove(struct device *dev) 


#ifdef CONFIG_PM

static int

mpc52xx_uart_suspend(struct device *dev, u32 state, u32 level)

mpc52xx_uart_suspend(struct device *dev, pm_message_t state, u32 level)

{

	struct uart_port *port = (struct uart_port *) dev_get_drvdata(dev);

drivers/video/imxfb.c

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ static void imxfb_setup_gpio(struct imxfb_info *fbi) 
 * Power management hooks.  Note that we won't be called from IRQ context,

 * unlike the blank functions above, so we may sleep.

 */

static int imxfb_suspend(struct device *dev, u32 state, u32 level)

static int imxfb_suspend(struct device *dev, pm_message_t state, u32 level)

{

	struct imxfb_info *fbi = dev_get_drvdata(dev);

	pr_debug("%s\n",__FUNCTION__);

sound/arm/aaci.c

+1 −1
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ static int aaci_do_resume(snd_card_t *card, unsigned int state) 
	return 0;

}



static int aaci_suspend(struct amba_device *dev, u32 state)

static int aaci_suspend(struct amba_device *dev, pm_message_t state)

{

	snd_card_t *card = amba_get_drvdata(dev);

	return card ? aaci_do_suspend(card) : 0;