Commit 948c6227 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent a0cf5951

drivers/staging/greybus/audio_module.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/greybus/bundle.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

drivers/staging/greybus/bundle.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/greybus/camera.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/greybus/es2.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include "arpc.h"

#include "greybus.h"

#include "greybus_trace.h"

#include "kernel_ver.h"

#include "connection.h"