From: Pavel Machek <pavel@suse.cz>
This fixes (part of) u32 vs. pm_message_t confusion in USB. It should cause
no code changes.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/usb/core/hub.c | 4 ++--
25-akpm/drivers/usb/host/sl811-hcd.c | 6 +++---
25-akpm/drivers/video/aty/radeon_pm.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff -puN drivers/usb/core/hub.c~fix-u32-vs-pm_message_t-in-usb drivers/usb/core/hub.c
--- 25/drivers/usb/core/hub.c~fix-u32-vs-pm_message_t-in-usb 2005-03-24 01:40:11.000000000 -0800
+++ 25-akpm/drivers/usb/core/hub.c 2005-03-24 01:40:11.000000000 -0800
@@ -1659,7 +1659,7 @@ static int __usb_suspend_device (struct
*
* Returns 0 on success, else negative errno.
*/
-int usb_suspend_device(struct usb_device *udev, u32 state)
+int usb_suspend_device(struct usb_device *udev, pm_message_t state)
{
int port1, status;
@@ -1985,7 +1985,7 @@ void usb_resume_root_hub(struct usb_devi
#else /* !CONFIG_USB_SUSPEND */
-int usb_suspend_device(struct usb_device *udev, u32 state)
+int usb_suspend_device(struct usb_device *udev, pm_message_t state)
{
return 0;
}
diff -puN drivers/usb/host/sl811-hcd.c~fix-u32-vs-pm_message_t-in-usb drivers/usb/host/sl811-hcd.c
--- 25/drivers/usb/host/sl811-hcd.c~fix-u32-vs-pm_message_t-in-usb 2005-03-24 01:40:11.000000000 -0800
+++ 25-akpm/drivers/usb/host/sl811-hcd.c 2005-03-24 01:40:11.000000000 -0800
@@ -101,12 +101,12 @@ static void port_power(struct sl811 *sl8
sl811->port1 = (1 << USB_PORT_FEAT_POWER);
sl811->irq_enable = SL11H_INTMASK_INSRMV;
- hcd->self.controller->power.power_state = PM_SUSPEND_ON;
+ hcd->self.controller->power.power_state = PMSG_ON;
} else {
sl811->port1 = 0;
sl811->irq_enable = 0;
hcd->state = HC_STATE_HALT;
- hcd->self.controller->power.power_state = PM_SUSPEND_DISK;
+ hcd->self.controller->power.power_state = PMSG_SUSPEND;
}
sl811->ctrl1 = 0;
sl811_write(sl811, SL11H_IRQ_ENABLE, 0);
@@ -1772,7 +1772,7 @@ sl811h_probe(struct device *dev)
*/
static int
-sl811h_suspend(struct device *dev, u32 state, u32 phase)
+sl811h_suspend(struct device *dev, pm_message_t state, u32 phase)
{
struct usb_hcd *hcd = dev_get_drvdata(dev);
struct sl811 *sl811 = hcd_to_sl811(hcd);
diff -puN drivers/video/aty/radeon_pm.c~fix-u32-vs-pm_message_t-in-usb drivers/video/aty/radeon_pm.c
--- 25/drivers/video/aty/radeon_pm.c~fix-u32-vs-pm_message_t-in-usb 2005-03-24 01:40:11.000000000 -0800
+++ 25-akpm/drivers/video/aty/radeon_pm.c 2005-03-24 01:40:11.000000000 -0800
@@ -2522,7 +2522,7 @@ static int radeon_restore_pci_cfg(struct
static/*extern*/ int susdisking = 0;
-int radeonfb_pci_suspend(struct pci_dev *pdev, u32 state)
+int radeonfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
{
struct fb_info *info = pci_get_drvdata(pdev);
struct radeonfb_info *rinfo = info->par;
_