driver model: fix types in usb

driver model: fix types in usb

[Pavel Machek]

Hi!

From: Bernard Blackham <bernard@blackham.com.au>

This fixes types in USB w.r.t. driver model. It should not actually
change any code. Please apply,

								Pavel

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

diff -ru linux-2.6.11-rc2-2.1.5.15/drivers/usb/core/hub.c linux-2.6.11-rc2-2.1.5.16/drivers/usb/core/hub.c
--- linux-2.6.11-rc2-2.1.5.15/drivers/usb/core/hub.c	2005-01-30 13:37:32.000000000 +0800
+++ linux-2.6.11-rc2-2.1.5.16/drivers/usb/core/hub.c	2005-02-02 22:30:48.000000000 +0800
@@ -1235,10 +1235,10 @@
 		 */
 		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 @@
  * 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 @@
 /**
  * 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 @@
 	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 @@
 	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 @@
 		}
 		up(&udev->serialize);
 	}
-	intf->dev.power.power_state = PM_SUSPEND_ON;
+	intf->dev.power.power_state = PMSG_ON;
 
 	hub_activate(hub);
 	return 0;



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

Re: driver model: fix types in usb

[Greg KH]

On Wed, Feb 02, 2005 at 09:26:10PM +0100, Pavel Machek wrote:
> Hi!
> 
> From: Bernard Blackham <bernard@blackham.com.au>
> 
> This fixes types in USB w.r.t. driver model. It should not actually
> change any code. Please apply,
> 
> 								Pavel
> 
> Signed-off-by: Pavel Machek <pavel@suse.cz>

Applied to my trees, thanks.

greg k-h