Remaining u32 vs. pm_message_t fixes

Remaining u32 vs. pm_message_t fixes

[Pavel Machek]

Hi!

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. Please apply,

Signed-off-by: Pavel Machek <pavel@suse.cz>
								Pavel

PS: Nigel, if you know about some other places in -rc1-mm3 where u32
is confused with pm_message_t, please let me know....

--- clean-mm/drivers/usb/host/sl811-hcd.c	2005-03-25 10:09:01.000000000 +0100
+++ linux-delme/drivers/usb/host/sl811-hcd.c	2005-03-25 11:20:53.000000000 +0100
@@ -1809,7 +1809,7 @@
 		return 0;
 	}
 
-	dev->power.power_state = PM_SUSPEND_ON;
+	dev->power.power_state = PMSG_ON;
 	return sl811h_hub_resume(hcd);
 }
 
--- clean-mm/drivers/video/i810/i810_main.c	2005-03-25 10:09:01.000000000 +0100
+++ linux-delme/drivers/video/i810/i810_main.c	2005-03-25 11:21:09.000000000 +0100
@@ -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);



-- 
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!

Re: Remaining u32 vs. pm_message_t fixes

[Russell King]

On Fri, Mar 25, 2005 at 11:24:52AM +0100, Pavel Machek wrote:
> 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. Please apply,

I suspect there's more than that still remaining.  Have you tried

$ grep suspend include/asm-arm -r

?

Also, what about include/linux/device.h's struct device_driver, for
platform device drivers ?

I think there's a significant amount of work still to be done with
the u32 -> pm_message_t conversion before you can even think about
changing pm_message_t to a struct.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core