[PATCH] Fix up some pm_message_t types
Fix up some pm_message_t types Signed-Off-By: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Родитель
1f87b1e6e6
Коммит
e36d394deb
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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__);
|
||||
|
|
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче