tree 7ff38dfd6025ea571b6b1e6a76aa8703c43d2841
parent 180b3311a960109e9ec271d4bd45d239652422d7
author Pavel Machek <[EMAIL PROTECTED]> Tue Apr 12 08:26:04 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:26:04 2005
[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]>
backlight/corgi_bl.c | 2 +-
pxafb.c | 2 +-
sa1100fb.c | 2 +-
savage/savagefb_driver.c | 4 ++--
w100fb.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
Index: drivers/video/backlight/corgi_bl.c
===================================================================
--- 2466679dfe7cc7f9a225705148a8373ea8b2e5b2/drivers/video/backlight/corgi_bl.c
(mode:100644 sha1:eb4d3511679593c938ac8c3c81d911b7ff19b7fc)
+++ 7ff38dfd6025ea571b6b1e6a76aa8703c43d2841/drivers/video/backlight/corgi_bl.c
(mode:100644 sha1:d4583db57342411691a5be7d4014ebe5767249c6)
@@ -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
===================================================================
--- 2466679dfe7cc7f9a225705148a8373ea8b2e5b2/drivers/video/pxafb.c
(mode:100644 sha1:aa328e58ee49509338b809e8ff3ce760f85e915c)
+++ 7ff38dfd6025ea571b6b1e6a76aa8703c43d2841/drivers/video/pxafb.c
(mode:100644 sha1:fd6d67961fda525055d77fea69aae756088649a4)
@@ -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
===================================================================
--- 2466679dfe7cc7f9a225705148a8373ea8b2e5b2/drivers/video/sa1100fb.c
(mode:100644 sha1:5364a1516174740df40d312066d4dee04aa385a0)
+++ 7ff38dfd6025ea571b6b1e6a76aa8703c43d2841/drivers/video/sa1100fb.c
(mode:100644 sha1:db7f6d3de43f8426249ec9f608700bd1825b0a6d)
@@ -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
===================================================================
---
2466679dfe7cc7f9a225705148a8373ea8b2e5b2/drivers/video/savage/savagefb_driver.c
(mode:100644 sha1:4a4628fc79d4a1866670e73da96dfbd5344c8723)
+++
7ff38dfd6025ea571b6b1e6a76aa8703c43d2841/drivers/video/savage/savagefb_driver.c
(mode:100644 sha1:86518dccad82e10857515beb010abd6506a15a02)
@@ -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
===================================================================
--- 2466679dfe7cc7f9a225705148a8373ea8b2e5b2/drivers/video/w100fb.c
(mode:100644 sha1:76f698eaecb858e112c891488fbad3e61925f42c)
+++ 7ff38dfd6025ea571b6b1e6a76aa8703c43d2841/drivers/video/w100fb.c
(mode:100644 sha1:d68d9bf6686501cf74f6400b269517736670c00d)
@@ -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
