[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 <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/video/backlight/corgi_bl.c b/drivers/video/backlight/corgi_bl.c
index 3c026b036c86c6f65c600022f24c9291d017639e..353cb3f73cf2f6267dbaf2a8a625d261742828ce 100644 (file)
--- 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 483ad9bab539043025cb01a7b0f73bd653f2eaee..815fbc8317fc612ab33bad2682bdd6133ad9a5cc 100644 (file)
--- 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 4f8043a71f21d1392438dade8c9ecafe0f7c0891..2d29db7ef800f195f8e583f456629da81d727c77 100644 (file)
--- 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 e1c9c946be2dc29bf66b9abb7b3c7cf8c9f8fa17..5bb8d60f35c40f7e94233c747ac9f411e12a65a7 100644 (file)
--- 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 057e154c8858d209b0fe74aa390501a0760f5d15..58cd2ad84afb2038b0fe5722965deaca555c7d49 100644 (file)
--- 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);