From: Pavel Machek This fixes (part of) u32 vs. pm_message_t confusion in USB. It should cause no code changes. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton --- 25-akpm/drivers/usb/core/hcd-pci.c | 2 +- 25-akpm/drivers/usb/core/hcd.h | 2 +- 25-akpm/drivers/usb/core/hub.c | 4 ++-- 25-akpm/drivers/usb/core/usb.c | 2 +- 25-akpm/drivers/usb/host/ehci-hcd.c | 2 +- 25-akpm/drivers/usb/host/ohci-pci.c | 2 +- 25-akpm/drivers/usb/host/sl811-hcd.c | 6 +++--- 25-akpm/drivers/usb/host/uhci-hcd.c | 2 +- 25-akpm/drivers/usb/input/hid-core.c | 4 ++-- drivers/usb/net/pegasus.c | 0 10 files changed, 13 insertions(+), 13 deletions(-) diff -puN drivers/usb/core/hcd.h~fix-u32-vs-pm_message_t-in-usb drivers/usb/core/hcd.h --- 25/drivers/usb/core/hcd.h~fix-u32-vs-pm_message_t-in-usb Thu Feb 17 16:40:02 2005 +++ 25-akpm/drivers/usb/core/hcd.h Thu Feb 17 16:40:02 2005 @@ -225,7 +225,7 @@ extern int usb_hcd_pci_probe (struct pci extern void usb_hcd_pci_remove (struct pci_dev *dev); #ifdef CONFIG_PM -extern int usb_hcd_pci_suspend (struct pci_dev *dev, u32 state); +extern int usb_hcd_pci_suspend (struct pci_dev *dev, pm_message_t state); extern int usb_hcd_pci_resume (struct pci_dev *dev); #endif /* CONFIG_PM */ diff -puN drivers/usb/core/hcd-pci.c~fix-u32-vs-pm_message_t-in-usb drivers/usb/core/hcd-pci.c --- 25/drivers/usb/core/hcd-pci.c~fix-u32-vs-pm_message_t-in-usb Thu Feb 17 16:40:02 2005 +++ 25-akpm/drivers/usb/core/hcd-pci.c Thu Feb 17 16:40:02 2005 @@ -327,7 +327,7 @@ int usb_hcd_pci_resume (struct pci_dev * if (has_pci_pm) pci_set_power_state (dev, 0); - dev->dev.power.power_state = 0; + dev->dev.power.power_state = PMSG_ON; retval = request_irq (dev->irq, usb_hcd_irq, SA_SHIRQ, hcd->driver->description, hcd); if (retval < 0) { 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 Thu Feb 17 16:40:02 2005 +++ 25-akpm/drivers/usb/core/hub.c Thu Feb 17 16:40:02 2005 @@ -1638,7 +1638,7 @@ int __usb_suspend_device (struct usb_dev * * 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; @@ -1953,7 +1953,7 @@ static int hub_resume(struct usb_interfa #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/core/usb.c~fix-u32-vs-pm_message_t-in-usb drivers/usb/core/usb.c --- 25/drivers/usb/core/usb.c~fix-u32-vs-pm_message_t-in-usb Thu Feb 17 16:40:02 2005 +++ 25-akpm/drivers/usb/core/usb.c Thu Feb 17 16:40:02 2005 @@ -1348,7 +1348,7 @@ void usb_buffer_unmap_sg (struct usb_dev usb_pipein (pipe) ? DMA_FROM_DEVICE : DMA_TO_DEVICE); } -static int usb_generic_suspend(struct device *dev, u32 state) +static int usb_generic_suspend(struct device *dev, pm_message_t state) { struct usb_interface *intf; struct usb_driver *driver; diff -puN drivers/usb/host/ehci-hcd.c~fix-u32-vs-pm_message_t-in-usb drivers/usb/host/ehci-hcd.c --- 25/drivers/usb/host/ehci-hcd.c~fix-u32-vs-pm_message_t-in-usb Thu Feb 17 16:40:02 2005 +++ 25-akpm/drivers/usb/host/ehci-hcd.c Thu Feb 17 16:40:02 2005 @@ -721,7 +721,7 @@ static int ehci_get_frame (struct usb_hc * the right sort of wakeup. */ -static int ehci_suspend (struct usb_hcd *hcd, u32 state) +static int ehci_suspend (struct usb_hcd *hcd, pci_power_t state) { struct ehci_hcd *ehci = hcd_to_ehci (hcd); diff -puN drivers/usb/host/ohci-pci.c~fix-u32-vs-pm_message_t-in-usb drivers/usb/host/ohci-pci.c --- 25/drivers/usb/host/ohci-pci.c~fix-u32-vs-pm_message_t-in-usb Thu Feb 17 16:40:02 2005 +++ 25-akpm/drivers/usb/host/ohci-pci.c Thu Feb 17 16:40:02 2005 @@ -102,7 +102,7 @@ ohci_pci_start (struct usb_hcd *hcd) #ifdef CONFIG_PM -static int ohci_pci_suspend (struct usb_hcd *hcd, u32 state) +static int ohci_pci_suspend (struct usb_hcd *hcd, pci_power_t state) { struct ohci_hcd *ohci = hcd_to_ohci (hcd); 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 Thu Feb 17 16:40:02 2005 +++ 25-akpm/drivers/usb/host/sl811-hcd.c Thu Feb 17 16:40:02 2005 @@ -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 = USB_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/usb/host/uhci-hcd.c~fix-u32-vs-pm_message_t-in-usb drivers/usb/host/uhci-hcd.c --- 25/drivers/usb/host/uhci-hcd.c~fix-u32-vs-pm_message_t-in-usb Thu Feb 17 16:40:02 2005 +++ 25-akpm/drivers/usb/host/uhci-hcd.c Thu Feb 17 16:40:02 2005 @@ -758,7 +758,7 @@ static void uhci_stop(struct usb_hcd *hc } #ifdef CONFIG_PM -static int uhci_suspend(struct usb_hcd *hcd, u32 state) +static int uhci_suspend(struct usb_hcd *hcd, pci_power_t state) { struct uhci_hcd *uhci = hcd_to_uhci(hcd); diff -puN drivers/usb/input/hid-core.c~fix-u32-vs-pm_message_t-in-usb drivers/usb/input/hid-core.c --- 25/drivers/usb/input/hid-core.c~fix-u32-vs-pm_message_t-in-usb Thu Feb 17 16:40:02 2005 +++ 25-akpm/drivers/usb/input/hid-core.c Thu Feb 17 16:40:02 2005 @@ -1869,7 +1869,7 @@ static int hid_probe (struct usb_interfa return 0; } -static int hid_suspend(struct usb_interface *intf, u32 state) +static int hid_suspend(struct usb_interface *intf, pm_message_t state) { struct hid_device *hid = usb_get_intfdata (intf); @@ -1884,7 +1884,7 @@ static int hid_resume(struct usb_interfa struct hid_device *hid = usb_get_intfdata (intf); int status; - intf->dev.power.power_state = PM_SUSPEND_ON; + intf->dev.power.power_state = PMSG_ON; if (hid->open) status = usb_submit_urb(hid->urbin, GFP_NOIO); else diff -puN drivers/usb/net/pegasus.c~fix-u32-vs-pm_message_t-in-usb drivers/usb/net/pegasus.c _