From 9bfd354b1b9c2f4faee121892bdfbc1490b51ab5 Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Sat, 16 Apr 2005 15:25:36 -0700 Subject: [PATCH] [PATCH] fix u32 vs. pm_message_t in driver/video This fixes u32 vs. pm_message_t confusion in drivers/video. Should change no code. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/video/backlight/corgi_bl.c | 2 +- drivers/video/pxafb.c | 2 +- drivers/video/sa1100fb.c | 2 +- drivers/video/savage/savagefb_driver.c | 4 ++-- drivers/video/w100fb.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/video/backlight/corgi_bl.c b/drivers/video/backlight/corgi_bl.c index 3c026b036c8..353cb3f73cf 100644 --- a/drivers/video/backlight/corgi_bl.c +++ b/drivers/video/backlight/corgi_bl.c @@ -81,7 +81,7 @@ static void corgibl_blank(int blank) } #ifdef CONFIG_PM -static int corgibl_suspend(struct device *dev, u32 state, u32 level) +static int corgibl_suspend(struct device *dev, pm_message_t state, u32 level) { if (level == SUSPEND_POWER_DOWN) corgibl_blank(FB_BLANK_POWERDOWN); diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 483ad9bab53..815fbc8317f 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c @@ -942,7 +942,7 @@ pxafb_freq_policy(struct notifier_block *nb, unsigned long val, void *data) * Power management hooks. Note that we won't be called from IRQ context, * unlike the blank functions above, so we may sleep. */ -static int pxafb_suspend(struct device *dev, u32 state, u32 level) +static int pxafb_suspend(struct device *dev, pm_message_t state, u32 level) { struct pxafb_info *fbi = dev_get_drvdata(dev); diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c index 4f8043a71f2..2d29db7ef80 100644 --- a/drivers/video/sa1100fb.c +++ b/drivers/video/sa1100fb.c @@ -1307,7 +1307,7 @@ sa1100fb_freq_policy(struct notifier_block *nb, unsigned long val, * Power management hooks. Note that we won't be called from IRQ context, * unlike the blank functions above, so we may sleep. */ -static int sa1100fb_suspend(struct device *dev, u32 state, u32 level) +static int sa1100fb_suspend(struct device *dev, pm_message_t state, u32 level) { struct sa1100fb_info *fbi = dev_get_drvdata(dev); diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c index e1c9c946be2..5bb8d60f35c 100644 --- a/drivers/video/savage/savagefb_driver.c +++ b/drivers/video/savage/savagefb_driver.c @@ -2103,7 +2103,7 @@ static void __devexit savagefb_remove (struct pci_dev *dev) } } -static int savagefb_suspend (struct pci_dev* dev, u32 state) +static int savagefb_suspend (struct pci_dev* dev, pm_message_t state) { struct fb_info *info = (struct fb_info *)pci_get_drvdata(dev); @@ -2118,7 +2118,7 @@ static int savagefb_suspend (struct pci_dev* dev, u32 state) release_console_sem(); pci_disable_device(dev); - pci_set_power_state(dev, state); + pci_set_power_state(dev, pci_choose_state(dev, state)); return 0; } diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c index 057e154c885..58cd2ad84af 100644 --- a/drivers/video/w100fb.c +++ b/drivers/video/w100fb.c @@ -544,7 +544,7 @@ static void w100fb_clear_buffer(void) #ifdef CONFIG_PM -static int w100fb_suspend(struct device *dev, u32 state, u32 level) +static int w100fb_suspend(struct device *dev, pm_message_t state, u32 level) { if (level == SUSPEND_POWER_DOWN) { struct fb_info *info = dev_get_drvdata(dev); -- 2.41.0