Messages in this thread Patch in this message | | | Date | Sun, 16 May 2004 11:14:05 -0700 | From | David Brownell <> | Subject | Re: [linux-usb-devel] [BK PATCH] USB changes for 2.6.6 |
| |
Linus Torvalds wrote: > > So I'd much rather just have two different functions, one in the CONFIG_PM > section, and one in the !CONFIG_PM one. That's how we already do > everything else in that header file (and how we handle PCI etc).
More like this then? I'm not sure whether you'd prefer to apply that logic to the "struct pm_info" innards too. That file has multiple CONFIG_PM sections, too.
- Dave --- 1.13/include/linux/pm.h Thu Aug 21 11:47:27 2003 +++ edited/include/linux/pm.h Sun May 16 11:11:06 2004 @@ -238,6 +238,24 @@ #endif }; +#ifdef CONFIG_PM + +static inline u32 +device_pm_state(struct dev_pm_info *info) +{ + return info->power_state; +} + +#else + +static inline u32 +device_pm_state(struct dev_pm_info *info) +{ + return 0; +} + +#endif + extern void device_pm_set_parent(struct device * dev, struct device * parent); extern int device_suspend(u32 state); --- 1.33/drivers/usb/host/ehci-dbg.c Fri May 7 12:48:33 2004 +++ edited/drivers/usb/host/ehci-dbg.c Sun May 16 10:49:54 2004 @@ -639,7 +639,7 @@ spin_lock_irqsave (&ehci->lock, flags); - if (bus->controller->power.power_state) { + if (device_pm_state (&bus->controller->power)) { size = scnprintf (next, size, "bus %s, device %s (driver " DRIVER_VERSION ")\n" "SUSPENDED (no register access)\n", --- 1.26/drivers/usb/host/ohci-dbg.c Tue May 11 13:17:33 2004 +++ edited/drivers/usb/host/ohci-dbg.c Sun May 16 10:49:54 2004 @@ -623,7 +623,7 @@ hcd->self.controller->bus_id, hcd_name); - if (bus->controller->power.power_state) { + if (device_pm_state (&bus->controller->power)) { size -= scnprintf (next, size, "SUSPENDED (no register access)\n"); goto done; | |