block / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
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>
hifive-unleashed-5.1
parent
ceb6c9c862
commit
47fafbc701
|
@ -1325,7 +1325,7 @@ void part_round_stats(int cpu, struct hd_struct *part)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(part_round_stats);
|
EXPORT_SYMBOL_GPL(part_round_stats);
|
||||||
|
|
||||||
#ifdef CONFIG_PM_RUNTIME
|
#ifdef CONFIG_PM
|
||||||
static void blk_pm_put_request(struct request *rq)
|
static void blk_pm_put_request(struct request *rq)
|
||||||
{
|
{
|
||||||
if (rq->q->dev && !(rq->cmd_flags & REQ_PM) && !--rq->q->nr_pending)
|
if (rq->q->dev && !(rq->cmd_flags & REQ_PM) && !--rq->q->nr_pending)
|
||||||
|
@ -2134,7 +2134,7 @@ void blk_account_io_done(struct request *req)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PM_RUNTIME
|
#ifdef CONFIG_PM
|
||||||
/*
|
/*
|
||||||
* Don't process normal requests when queue is suspended
|
* Don't process normal requests when queue is suspended
|
||||||
* or in the process of suspending/resuming
|
* or in the process of suspending/resuming
|
||||||
|
@ -3159,7 +3159,7 @@ void blk_finish_plug(struct blk_plug *plug)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(blk_finish_plug);
|
EXPORT_SYMBOL(blk_finish_plug);
|
||||||
|
|
||||||
#ifdef CONFIG_PM_RUNTIME
|
#ifdef CONFIG_PM
|
||||||
/**
|
/**
|
||||||
* blk_pm_runtime_init - Block layer runtime PM initialization routine
|
* blk_pm_runtime_init - Block layer runtime PM initialization routine
|
||||||
* @q: the queue of the device
|
* @q: the queue of the device
|
||||||
|
|
|
@ -539,7 +539,7 @@ void elv_bio_merged(struct request_queue *q, struct request *rq,
|
||||||
e->type->ops.elevator_bio_merged_fn(q, rq, bio);
|
e->type->ops.elevator_bio_merged_fn(q, rq, bio);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PM_RUNTIME
|
#ifdef CONFIG_PM
|
||||||
static void blk_pm_requeue_request(struct request *rq)
|
static void blk_pm_requeue_request(struct request *rq)
|
||||||
{
|
{
|
||||||
if (rq->q->dev && !(rq->cmd_flags & REQ_PM))
|
if (rq->q->dev && !(rq->cmd_flags & REQ_PM))
|
||||||
|
|
|
@ -398,7 +398,7 @@ struct request_queue {
|
||||||
*/
|
*/
|
||||||
struct kobject mq_kobj;
|
struct kobject mq_kobj;
|
||||||
|
|
||||||
#ifdef CONFIG_PM_RUNTIME
|
#ifdef CONFIG_PM
|
||||||
struct device *dev;
|
struct device *dev;
|
||||||
int rpm_status;
|
int rpm_status;
|
||||||
unsigned int nr_pending;
|
unsigned int nr_pending;
|
||||||
|
@ -1057,7 +1057,7 @@ extern void blk_put_queue(struct request_queue *);
|
||||||
/*
|
/*
|
||||||
* block layer runtime pm functions
|
* 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 void blk_pm_runtime_init(struct request_queue *q, struct device *dev);
|
||||||
extern int blk_pre_runtime_suspend(struct request_queue *q);
|
extern int blk_pre_runtime_suspend(struct request_queue *q);
|
||||||
extern void blk_post_runtime_suspend(struct request_queue *q, int err);
|
extern void blk_post_runtime_suspend(struct request_queue *q, int err);
|
||||||
|
|
Loading…
Reference in New Issue