diff options
| author | Rafael J. Wysocki <[email protected]> | 2014-11-29 22:47:05 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2014-12-03 23:51:54 +0000 |
| commit | ceb6c9c862c86423f41c1e20ecf8d454f837f519 (patch) | |
| tree | 23b6b5cb563720c9562977f4835d004c1d12f7bd /drivers/usb/core/sysfs.c | |
| parent | PM: Merge the SET*_RUNTIME_PM_OPS() macros (diff) | |
| download | kernel-ceb6c9c862c86423f41c1e20ecf8d454f837f519.tar.gz kernel-ceb6c9c862c86423f41c1e20ecf8d454f837f519.zip | |
USB / PM: Drop CONFIG_PM_RUNTIME from the USB core
After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so quite a few
depend on CONFIG_PM (or even dropped in some cases).
Replace CONFIG_PM_RUNTIME with CONFIG_PM in the USB core code
and documentation.
Signed-off-by: Rafael J. Wysocki <[email protected]>
Acked-by: Alan Stern <[email protected]>
Acked-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'drivers/usb/core/sysfs.c')
| -rw-r--r-- | drivers/usb/core/sysfs.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c index 1236c6011c70..d26973844a4d 100644 --- a/drivers/usb/core/sysfs.c +++ b/drivers/usb/core/sysfs.c @@ -334,14 +334,6 @@ static void remove_persist_attributes(struct device *dev) &dev_attr_persist.attr, power_group_name); } -#else - -#define add_persist_attributes(dev) 0 -#define remove_persist_attributes(dev) do {} while (0) - -#endif /* CONFIG_PM */ - -#ifdef CONFIG_PM_RUNTIME static ssize_t connected_duration_show(struct device *dev, struct device_attribute *attr, char *buf) @@ -585,10 +577,13 @@ static void remove_power_attributes(struct device *dev) #else +#define add_persist_attributes(dev) 0 +#define remove_persist_attributes(dev) do {} while (0) + #define add_power_attributes(dev) 0 #define remove_power_attributes(dev) do {} while (0) -#endif /* CONFIG_PM_RUNTIME */ +#endif /* CONFIG_PM */ /* Descriptor fields */ |