From: Pavel Machek From: Bernard Blackham This fixes types in USB w.r.t. driver model. It should not actually change any code. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton --- 25-akpm/drivers/usb/core/hub.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff -puN drivers/usb/core/hub.c~driver-model-fix-types-in-usb drivers/usb/core/hub.c --- 25/drivers/usb/core/hub.c~driver-model-fix-types-in-usb 2005-02-02 18:24:40.827615688 -0800 +++ 25-akpm/drivers/usb/core/hub.c 2005-02-02 18:24:40.833614776 -0800 @@ -1235,10 +1235,10 @@ int usb_new_device(struct usb_device *ud */ if (udev->bus->b_hnp_enable || udev->bus->is_b_host) { static int __usb_suspend_device (struct usb_device *, - int port1, u32 state); + int port1, pm_message_t state); err = __usb_suspend_device(udev, udev->bus->otg_port, - PM_SUSPEND_MEM); + PMSG_SUSPEND); if (err < 0) dev_dbg(&udev->dev, "HNP fail, %d\n", err); } @@ -1523,7 +1523,7 @@ static int hub_port_suspend(struct usb_h * Linux (2.6) currently has NO mechanisms to initiate that: no khubd * timer, no SRP, no requests through sysfs. */ -int __usb_suspend_device (struct usb_device *udev, int port1, u32 state) +int __usb_suspend_device (struct usb_device *udev, int port1, pm_message_t state) { int status; @@ -1621,7 +1621,7 @@ int __usb_suspend_device (struct usb_dev /** * usb_suspend_device - suspend a usb device * @udev: device that's no longer in active use - * @state: PM_SUSPEND_MEM to suspend + * @state: PMSG_SUSPEND to suspend * Context: must be able to sleep; device not locked * * Suspends a USB device that isn't in active use, conserving power. @@ -1670,7 +1670,7 @@ static int finish_port_resume(struct usb usb_set_device_state(udev, udev->actconfig ? USB_STATE_CONFIGURED : USB_STATE_ADDRESS); - udev->dev.power.power_state = PM_SUSPEND_ON; + udev->dev.power.power_state = PMSG_ON; /* 10.5.4.5 says be sure devices in the tree are still there. * For now let's assume the device didn't go crazy on resume, @@ -1871,7 +1871,7 @@ static int remote_wakeup(struct usb_devi return status; } -static int hub_suspend(struct usb_interface *intf, u32 state) +static int hub_suspend(struct usb_interface *intf, pm_message_t state) { struct usb_hub *hub = usb_get_intfdata (intf); struct usb_device *hdev = hub->hdev; @@ -1943,7 +1943,7 @@ static int hub_resume(struct usb_interfa } up(&udev->serialize); } - intf->dev.power.power_state = PM_SUSPEND_ON; + intf->dev.power.power_state = PMSG_ON; hub_activate(hub); return 0; _