Commit 8bf28030 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds

[PATCH] fix u32 vs. pm_message_t in pcmcia

This fixes u32 vs. pm_message_t in pcmcia.
Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 05adc3b7
......@@ -518,7 +518,7 @@ static int au1x00_drv_pcmcia_probe(struct device *dev)
}
static int au1x00_drv_pcmcia_suspend(struct device *dev, u32 state, u32 level)
static int au1x00_drv_pcmcia_suspend(struct device *dev, pm_message_t state, u32 level)
{
int ret = 0;
if (level == SUSPEND_SAVE_STATE)
......
......@@ -845,7 +845,7 @@ static void hs_exit_socket(hs_socket_t *sp)
local_irq_restore(flags);
}
static int hd64465_suspend(struct device *dev, u32 state, u32 level)
static int hd64465_suspend(struct device *dev, pm_message_t state, u32 level)
{
int ret = 0;
if (level == SUSPEND_SAVE_STATE)
......
......@@ -743,7 +743,7 @@ static struct pccard_operations pcc_operations = {
/*====================================================================*/
static int m32r_pcc_suspend(struct device *dev, u32 state, u32 level)
static int m32r_pcc_suspend(struct device *dev, pm_message_t state, u32 level)
{
int ret = 0;
if (level == SUSPEND_SAVE_STATE)
......
......@@ -696,7 +696,7 @@ static struct pccard_operations pcc_operations = {
/*====================================================================*/
static int m32r_pcc_suspend(struct device *dev, u32 state, u32 level)
static int m32r_pcc_suspend(struct device *dev, pm_message_t state, u32 level)
{
int ret = 0;
if (level == SUSPEND_SAVE_STATE)
......
......@@ -205,7 +205,7 @@ int pxa2xx_drv_pcmcia_probe(struct device *dev)
}
EXPORT_SYMBOL(pxa2xx_drv_pcmcia_probe);
static int pxa2xx_drv_pcmcia_suspend(struct device *dev, u32 state, u32 level)
static int pxa2xx_drv_pcmcia_suspend(struct device *dev, pm_message_t state, u32 level)
{
int ret = 0;
if (level == SUSPEND_SAVE_STATE)
......
......@@ -75,7 +75,7 @@ static int sa11x0_drv_pcmcia_probe(struct device *dev)
return ret;
}
static int sa11x0_drv_pcmcia_suspend(struct device *dev, u32 state, u32 level)
static int sa11x0_drv_pcmcia_suspend(struct device *dev, pm_message_t state, u32 level)
{
int ret = 0;
if (level == SUSPEND_SAVE_STATE)
......
......@@ -158,7 +158,7 @@ static int __devexit pcmcia_remove(struct sa1111_dev *dev)
return 0;
}
static int pcmcia_suspend(struct sa1111_dev *dev, u32 state)
static int pcmcia_suspend(struct sa1111_dev *dev, pm_message_t state)
{
return pcmcia_socket_dev_suspend(&dev->dev, state);
}
......
......@@ -774,7 +774,7 @@ static int __devinit vrc4171_card_setup(char *options)
__setup("vrc4171_card=", vrc4171_card_setup);
static int vrc4171_card_suspend(struct device *dev, u32 state, u32 level)
static int vrc4171_card_suspend(struct device *dev, pm_message_t state, u32 level)
{
int retval = 0;
......
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