ChangeSet 1.2215, 2005/03/30 09:45:58-08:00, [EMAIL PROTECTED]
[PATCH] Remaining u32 vs. pm_message_t fixes
This fixes three remaining places where we put u32 (or worse
suspend_state_t) into pm_message_t-sized box. As a bonus, PCI_D0 is
used
instead of constant 0.
Signed-off-by: Pavel Machek <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
usb/host/sl811-hcd.c | 2 +-
video/i810/i810_main.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff -Nru a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
--- a/drivers/usb/host/sl811-hcd.c 2005-03-30 12:14:16 -08:00
+++ b/drivers/usb/host/sl811-hcd.c 2005-03-30 12:14:16 -08:00
@@ -1809,7 +1809,7 @@
return 0;
}
- dev->power.power_state = PM_SUSPEND_ON;
+ dev->power.power_state = PMSG_ON;
return sl811h_hub_resume(hcd);
}
diff -Nru a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
--- a/drivers/video/i810/i810_main.c 2005-03-30 12:14:16 -08:00
+++ b/drivers/video/i810/i810_main.c 2005-03-30 12:14:16 -08:00
@@ -1492,7 +1492,7 @@
/***********************************************************************
* Power Management *
***********************************************************************/
-static int i810fb_suspend(struct pci_dev *dev, u32 state)
+static int i810fb_suspend(struct pci_dev *dev, pm_message_t state)
{
struct fb_info *info = pci_get_drvdata(dev);
struct i810fb_par *par = (struct i810fb_par *) info->par;
@@ -1538,7 +1538,7 @@
return 0;
pci_restore_state(dev);
- pci_set_power_state(dev, 0);
+ pci_set_power_state(dev, PCI_D0);
pci_enable_device(dev);
agp_bind_memory(par->i810_gtt.i810_fb_memory,
par->fb.offset);
-
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
