aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/core/usb.h
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2006-07-01 22:14:24 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-09-27 14:58:50 -0400
commitd388dab7b562b76525761f89702246686747ba30 (patch)
tree5bd84a39fcd05800d83b8ba5df1262568ab130ae /drivers/usb/core/usb.h
parent1c5df7e705671f11a71112eb3a1f9765cd1719f9 (diff)
hub driver: improve use of #ifdef
This patch (as736) makes the hub driver more readable by improving the usage of "#ifdef CONFIG_PM" and "#ifdef CONFIG_USB_SUSPEND". Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core/usb.h')
-rw-r--r--drivers/usb/core/usb.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index 74df0db954c9..98675fb1bc4c 100644
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -30,11 +30,22 @@ extern void usb_major_cleanup(void);
30extern int usb_host_init(void); 30extern int usb_host_init(void);
31extern void usb_host_cleanup(void); 31extern void usb_host_cleanup(void);
32 32
33#ifdef CONFIG_PM
34
33extern int usb_suspend_both(struct usb_device *udev, pm_message_t msg); 35extern int usb_suspend_both(struct usb_device *udev, pm_message_t msg);
34extern int usb_resume_both(struct usb_device *udev); 36extern int usb_resume_both(struct usb_device *udev);
35extern int usb_port_suspend(struct usb_device *dev); 37extern int usb_port_suspend(struct usb_device *dev);
36extern int usb_port_resume(struct usb_device *dev); 38extern int usb_port_resume(struct usb_device *dev);
37 39
40#else
41
42#define usb_suspend_both(udev, msg) 0
43#define usb_resume_both(udev) 0
44#define usb_port_suspend(dev) 0
45#define usb_port_resume(dev) 0
46
47#endif
48
38extern struct bus_type usb_bus_type; 49extern struct bus_type usb_bus_type;
39extern struct usb_device_driver usb_generic_driver; 50extern struct usb_device_driver usb_generic_driver;
40 51