GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-17 12:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

block / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM

Browse source 
After commit b2b49ccbdd (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks
depending on CONFIG_PM_RUNTIME may now be changed to depend on
CONFIG_PM.

Replace CONFIG_PM_RUNTIME with CONFIG_PM in the block device core.

Reviewed-by: Aaron Lu <aaron.lu@intel.com>
Acked-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Rafael J. Wysocki 2014-12-04 01:00:23 +01:00
parent ceb6c9c862
commit 47fafbc701
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/linux/blkdev.h
View file

@ -398,7 +398,7 @@ struct request_queue {
*/
struct kobject mq_kobj;
#ifdef CONFIG_PM_RUNTIME
#ifdef CONFIG_PM
struct device *dev;
int rpm_status;
unsigned int nr_pending;
@ -1057,7 +1057,7 @@ extern void blk_put_queue(struct request_queue *);
/*
* block layer runtime pm functions
*/
#ifdef CONFIG_PM_RUNTIME
#ifdef CONFIG_PM
extern void blk_pm_runtime_init(struct request_queue *q, struct device *dev);
extern int blk_pre_runtime_suspend(struct request_queue *q);
extern void blk_post_runtime_suspend(struct request_queue *q, int err);