korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 00:34:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

staging: greybus: remove CONFIG_PM_RUNTIME from kernel_ver.h

Browse Source 
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>
This commit is contained in:
Greg Kroah-Hartman 2016-09-09 09:47:01 +02:00
parent a0cf5951de
commit 948c6227e7
10 changed files with 7 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/greybus/audio_module.c
View File

@ -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);

3
drivers/staging/greybus/bundle.c
View File

@ -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;

2
drivers/staging/greybus/bundle.h
View File

@ -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;

2
drivers/staging/greybus/camera.c
View File

@ -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);

1
drivers/staging/greybus/es2.c
View File

@ -17,7 +17,6 @@
#include "arpc.h"
#include "greybus.h"
#include "greybus_trace.h"
#include "kernel_ver.h"
#include "connection.h"

2
drivers/staging/greybus/gbphy.c
View File

@ -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);

2
drivers/staging/greybus/gbphy.h
View File

@ -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;

1
drivers/staging/greybus/greybus.h
View File

@ -21,7 +21,6 @@
#include <linux/pm_runtime.h>
#include <linux/idr.h>
#include "kernel_ver.h"
#include "greybus_id.h"
#include "greybus_manifest.h"
#include "greybus_protocols.h"

2
drivers/staging/greybus/interface.c
View File

@ -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);

33
drivers/staging/greybus/kernel_ver.h
View File

@ -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 <linux/kernel.h>
#include <linux/version.h>
#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 */