tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

staging: greybus: remove CONFIG_PM_RUNTIME from kernel_ver.h

The last thing remaining in kernel_ver.h was the setting of
CONFIG_PM_RUNTIME, which isn't needed in a in-tree implementation. So
remove the setting of this value, and the .h file entirely as that was
the last thing left in it.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Greg Kroah-Hartman 948c6227 a0cf5951

+7 -43
+1 -1
drivers/staging/greybus/audio_module.c
··· 421 421 }; 422 422 MODULE_DEVICE_TABLE(greybus, gb_audio_id_table); 423 423 424 - #ifdef CONFIG_PM_RUNTIME 424 + #ifdef CONFIG_PM 425 425 static int gb_audio_suspend(struct device *dev) 426 426 { 427 427 struct gb_bundle *bundle = to_gb_bundle(dev);
+1 -2
drivers/staging/greybus/bundle.c
··· 89 89 kfree(bundle); 90 90 } 91 91 92 - #ifdef CONFIG_PM_RUNTIME 93 - 92 + #ifdef CONFIG_PM 94 93 static void gb_bundle_disable_all_connections(struct gb_bundle *bundle) 95 94 { 96 95 struct gb_connection *connection;
+1 -1
drivers/staging/greybus/bundle.h
··· 41 41 void gb_bundle_destroy(struct gb_bundle *bundle); 42 42 43 43 /* Bundle Runtime PM wrappers */ 44 - #ifdef CONFIG_PM_RUNTIME 44 + #ifdef CONFIG_PM 45 45 static inline int gb_pm_runtime_get_sync(struct gb_bundle *bundle) 46 46 { 47 47 int retval;
+1 -1
drivers/staging/greybus/camera.c
··· 1344 1344 { }, 1345 1345 }; 1346 1346 1347 - #ifdef CONFIG_PM_RUNTIME 1347 + #ifdef CONFIG_PM 1348 1348 static int gb_camera_suspend(struct device *dev) 1349 1349 { 1350 1350 struct gb_bundle *bundle = to_gb_bundle(dev);
-1
drivers/staging/greybus/es2.c
··· 17 17 #include "arpc.h" 18 18 #include "greybus.h" 19 19 #include "greybus_trace.h" 20 - #include "kernel_ver.h" 21 20 #include "connection.h" 22 21 23 22
+1 -1
drivers/staging/greybus/gbphy.c
··· 52 52 kfree(gbphy_dev); 53 53 } 54 54 55 - #ifdef CONFIG_PM_RUNTIME 55 + #ifdef CONFIG_PM 56 56 static int gb_gbphy_idle(struct device *dev) 57 57 { 58 58 pm_runtime_mark_last_busy(dev);
+1 -1
drivers/staging/greybus/gbphy.h
··· 66 66 #define module_gbphy_driver(__gbphy_driver) \ 67 67 module_driver(__gbphy_driver, gb_gbphy_register, gb_gbphy_deregister) 68 68 69 - #ifdef CONFIG_PM_RUNTIME 69 + #ifdef CONFIG_PM 70 70 static inline int gbphy_runtime_get_sync(struct gbphy_device *gbphy_dev) 71 71 { 72 72 struct device *dev = &gbphy_dev->dev;
-1
drivers/staging/greybus/greybus.h
··· 21 21 #include <linux/pm_runtime.h> 22 22 #include <linux/idr.h> 23 23 24 - #include "kernel_ver.h" 25 24 #include "greybus_id.h" 26 25 #include "greybus_manifest.h" 27 26 #include "greybus_protocols.h"
+1 -1
drivers/staging/greybus/interface.c
··· 698 698 kfree(intf); 699 699 } 700 700 701 - #ifdef CONFIG_PM_RUNTIME 701 + #ifdef CONFIG_PM 702 702 static int gb_interface_suspend(struct device *dev) 703 703 { 704 704 struct gb_interface *intf = to_gb_interface(dev);
-33
drivers/staging/greybus/kernel_ver.h
··· 1 - /* 2 - * Greybus kernel "version" glue logic. 3 - * 4 - * Copyright 2014 Google Inc. 5 - * Copyright 2014 Linaro Ltd. 6 - * 7 - * Released under the GPLv2 only. 8 - * 9 - * Backports of newer kernel apis to allow the code to build properly on older 10 - * kernel versions. Remove this file when merging to upstream, it should not be 11 - * needed at all 12 - */ 13 - 14 - #ifndef __GREYBUS_KERNEL_VER_H 15 - #define __GREYBUS_KERNEL_VER_H 16 - 17 - #include <linux/kernel.h> 18 - #include <linux/version.h> 19 - 20 - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) 21 - /* 22 - * After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is 23 - * selected) PM_RUNTIME is always set if PM is set, so files that are build 24 - * conditionally if CONFIG_PM_RUNTIME is set may now be build if CONFIG_PM is 25 - * set. 26 - */ 27 - 28 - #ifdef CONFIG_PM 29 - #define CONFIG_PM_RUNTIME 30 - #endif /* CONFIG_PM */ 31 - #endif 32 - 33 - #endif /* __GREYBUS_KERNEL_VER_H */