diff options
| author | Pavel Machek <pavel@suse.cz> | 2005-03-29 17:43:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-29 17:43:23 -0800 |
| commit | 5c7ee81e002953ffdc98bde7805081068aa74245 (patch) | |
| tree | 9e55f24e41974f8c353b380f34ed299dcf4e6a94 | |
| parent | 1742768359e8123d6ad3c9fa5e5ed3371a6ae5d7 (diff) | |
| download | history-5c7ee81e002953ffdc98bde7805081068aa74245.tar.gz | |
[PATCH] Fix u32 vs. pm_message_t in USB
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>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/usb/core/hub.c | 4 | ||||
| -rw-r--r-- | drivers/usb/host/sl811-hcd.c | 6 | ||||
| -rw-r--r-- | drivers/video/aty/radeon_pm.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 90a45935da7e8..4164daa979761 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -1646,7 +1646,7 @@ int __usb_suspend_device (struct usb_device *udev, int port1, pm_message_t state * * 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; @@ -1961,7 +1961,7 @@ static int hub_resume(struct usb_interface *intf) #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 --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c index b40a4039e1935..1c5c696df7373 100644 --- a/drivers/usb/host/sl811-hcd.c +++ b/drivers/usb/host/sl811-hcd.c @@ -101,12 +101,12 @@ static void port_power(struct sl811 *sl811, int is_on) 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 --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c index f29de21e6e92c..d03fea3456924 100644 --- a/drivers/video/aty/radeon_pm.c +++ b/drivers/video/aty/radeon_pm.c @@ -2521,7 +2521,7 @@ static int radeon_restore_pci_cfg(struct radeonfb_info *rinfo) 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; |