tree 292b71ae99b8ad8d699237d6fc8b718636ef5f2d
parent 0370affeec3e751412e917aab931d8ba52680578
author Pavel Machek <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:36 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:36 -0700
[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 <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
video/backlight/corgi_bl.c | 2 +-
video/pxafb.c | 2 +-
video/sa1100fb.c | 2 +-
video/savage/savagefb_driver.c | 4 ++--
video/w100fb.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
Index: drivers/video/backlight/corgi_bl.c
===================================================================
--- da7698bc4130e252372d56b7e251453d1eccefe3/drivers/video/backlight/corgi_bl.c
(mode:100644 sha1:3c026b036c86c6f65c600022f24c9291d017639e)
+++ 292b71ae99b8ad8d699237d6fc8b718636ef5f2d/drivers/video/backlight/corgi_bl.c
(mode:100644 sha1:353cb3f73cf2f6267dbaf2a8a625d261742828ce)
@@ -81,7 +81,7 @@
}
#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);
Index: drivers/video/pxafb.c
===================================================================
--- da7698bc4130e252372d56b7e251453d1eccefe3/drivers/video/pxafb.c
(mode:100644 sha1:483ad9bab539043025cb01a7b0f73bd653f2eaee)
+++ 292b71ae99b8ad8d699237d6fc8b718636ef5f2d/drivers/video/pxafb.c
(mode:100644 sha1:815fbc8317fc612ab33bad2682bdd6133ad9a5cc)
@@ -942,7 +942,7 @@
* 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);
Index: drivers/video/sa1100fb.c
===================================================================
--- da7698bc4130e252372d56b7e251453d1eccefe3/drivers/video/sa1100fb.c
(mode:100644 sha1:4f8043a71f21d1392438dade8c9ecafe0f7c0891)
+++ 292b71ae99b8ad8d699237d6fc8b718636ef5f2d/drivers/video/sa1100fb.c
(mode:100644 sha1:2d29db7ef800f195f8e583f456629da81d727c77)
@@ -1307,7 +1307,7 @@
* 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);
Index: drivers/video/savage/savagefb_driver.c
===================================================================
---
da7698bc4130e252372d56b7e251453d1eccefe3/drivers/video/savage/savagefb_driver.c
(mode:100644 sha1:e1c9c946be2dc29bf66b9abb7b3c7cf8c9f8fa17)
+++
292b71ae99b8ad8d699237d6fc8b718636ef5f2d/drivers/video/savage/savagefb_driver.c
(mode:100644 sha1:5bb8d60f35c40f7e94233c747ac9f411e12a65a7)
@@ -2103,7 +2103,7 @@
}
}
-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 @@
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;
}
Index: drivers/video/w100fb.c
===================================================================
--- da7698bc4130e252372d56b7e251453d1eccefe3/drivers/video/w100fb.c
(mode:100644 sha1:057e154c8858d209b0fe74aa390501a0760f5d15)
+++ 292b71ae99b8ad8d699237d6fc8b718636ef5f2d/drivers/video/w100fb.c
(mode:100644 sha1:58cd2ad84afb2038b0fe5722965deaca555c7d49)
@@ -544,7 +544,7 @@
#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);
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
