From 948c6227e76ef2443b327a409dc8eced92b32bda Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 9 Sep 2016 09:47:01 +0200 Subject: [PATCH] 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 --- drivers/staging/greybus/audio_module.c | 2 +- drivers/staging/greybus/bundle.c | 3 +-- drivers/staging/greybus/bundle.h | 2 +- drivers/staging/greybus/camera.c | 2 +- drivers/staging/greybus/es2.c | 1 - drivers/staging/greybus/gbphy.c | 2 +- drivers/staging/greybus/gbphy.h | 2 +- drivers/staging/greybus/greybus.h | 1 - drivers/staging/greybus/interface.c | 2 +- drivers/staging/greybus/kernel_ver.h | 33 --------------------------------- 10 files changed, 7 insertions(+), 43 deletions(-) delete mode 100644 drivers/staging/greybus/kernel_ver.h diff --git a/drivers/staging/greybus/audio_module.c b/drivers/staging/greybus/audio_module.c index 411735d..ae1c0fa 100644 --- a/drivers/staging/greybus/audio_module.c +++ b/drivers/staging/greybus/audio_module.c @@ -421,7 +421,7 @@ static const struct greybus_bundle_id gb_audio_id_table[] = { }; MODULE_DEVICE_TABLE(greybus, gb_audio_id_table); -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int gb_audio_suspend(struct device *dev) { struct gb_bundle *bundle = to_gb_bundle(dev); diff --git a/drivers/staging/greybus/bundle.c b/drivers/staging/greybus/bundle.c index 5bd7731..d2ef57d 100644 --- a/drivers/staging/greybus/bundle.c +++ b/drivers/staging/greybus/bundle.c @@ -89,8 +89,7 @@ static void gb_bundle_release(struct device *dev) kfree(bundle); } -#ifdef CONFIG_PM_RUNTIME - +#ifdef CONFIG_PM static void gb_bundle_disable_all_connections(struct gb_bundle *bundle) { struct gb_connection *connection; diff --git a/drivers/staging/greybus/bundle.h b/drivers/staging/greybus/bundle.h index 349845e..0c3491d 100644 --- a/drivers/staging/greybus/bundle.h +++ b/drivers/staging/greybus/bundle.h @@ -41,7 +41,7 @@ int gb_bundle_add(struct gb_bundle *bundle); void gb_bundle_destroy(struct gb_bundle *bundle); /* Bundle Runtime PM wrappers */ -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static inline int gb_pm_runtime_get_sync(struct gb_bundle *bundle) { int retval; diff --git a/drivers/staging/greybus/camera.c b/drivers/staging/greybus/camera.c index e1f3046..46d2e8a 100644 --- a/drivers/staging/greybus/camera.c +++ b/drivers/staging/greybus/camera.c @@ -1344,7 +1344,7 @@ static const struct greybus_bundle_id gb_camera_id_table[] = { { }, }; -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int gb_camera_suspend(struct device *dev) { struct gb_bundle *bundle = to_gb_bundle(dev); diff --git a/drivers/staging/greybus/es2.c b/drivers/staging/greybus/es2.c index 6cb13fc..071bb1c 100644 --- a/drivers/staging/greybus/es2.c +++ b/drivers/staging/greybus/es2.c @@ -17,7 +17,6 @@ #include "arpc.h" #include "greybus.h" #include "greybus_trace.h" -#include "kernel_ver.h" #include "connection.h" diff --git a/drivers/staging/greybus/gbphy.c b/drivers/staging/greybus/gbphy.c index 478c162..bcde7c9 100644 --- a/drivers/staging/greybus/gbphy.c +++ b/drivers/staging/greybus/gbphy.c @@ -52,7 +52,7 @@ static void gbphy_dev_release(struct device *dev) kfree(gbphy_dev); } -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int gb_gbphy_idle(struct device *dev) { pm_runtime_mark_last_busy(dev); diff --git a/drivers/staging/greybus/gbphy.h b/drivers/staging/greybus/gbphy.h index e251186..8ee6805 100644 --- a/drivers/staging/greybus/gbphy.h +++ b/drivers/staging/greybus/gbphy.h @@ -66,7 +66,7 @@ void gb_gbphy_deregister_driver(struct gbphy_driver *driver); #define module_gbphy_driver(__gbphy_driver) \ module_driver(__gbphy_driver, gb_gbphy_register, gb_gbphy_deregister) -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static inline int gbphy_runtime_get_sync(struct gbphy_device *gbphy_dev) { struct device *dev = &gbphy_dev->dev; diff --git a/drivers/staging/greybus/greybus.h b/drivers/staging/greybus/greybus.h index 3e32028..1252688 100644 --- a/drivers/staging/greybus/greybus.h +++ b/drivers/staging/greybus/greybus.h @@ -21,7 +21,6 @@ #include #include -#include "kernel_ver.h" #include "greybus_id.h" #include "greybus_manifest.h" #include "greybus_protocols.h" diff --git a/drivers/staging/greybus/interface.c b/drivers/staging/greybus/interface.c index c3ed3d7..546b090 100644 --- a/drivers/staging/greybus/interface.c +++ b/drivers/staging/greybus/interface.c @@ -698,7 +698,7 @@ static void gb_interface_release(struct device *dev) kfree(intf); } -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int gb_interface_suspend(struct device *dev) { struct gb_interface *intf = to_gb_interface(dev); diff --git a/drivers/staging/greybus/kernel_ver.h b/drivers/staging/greybus/kernel_ver.h deleted file mode 100644 index cfd7bc7..0000000 --- a/drivers/staging/greybus/kernel_ver.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Greybus kernel "version" glue logic. - * - * Copyright 2014 Google Inc. - * Copyright 2014 Linaro Ltd. - * - * Released under the GPLv2 only. - * - * Backports of newer kernel apis to allow the code to build properly on older - * kernel versions. Remove this file when merging to upstream, it should not be - * needed at all - */ - -#ifndef __GREYBUS_KERNEL_VER_H -#define __GREYBUS_KERNEL_VER_H - -#include -#include - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) -/* - * After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is - * selected) PM_RUNTIME is always set if PM is set, so files that are build - * conditionally if CONFIG_PM_RUNTIME is set may now be build if CONFIG_PM is - * set. - */ - -#ifdef CONFIG_PM -#define CONFIG_PM_RUNTIME -#endif /* CONFIG_PM */ -#endif - -#endif /* __GREYBUS_KERNEL_VER_H */ -- 2.7.4