Commit 47fafbc7 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

block / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM 



After commit b2b49ccb (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: default avatarAaron Lu <aaron.lu@intel.com>
Acked-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent ceb6c9c8

block/blk-core.c

+3 −3
Original line number Diff line number Diff line
@@ -1325,7 +1325,7 @@ void part_round_stats(int cpu, struct hd_struct *part) 
}

EXPORT_SYMBOL_GPL(part_round_stats);



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static void blk_pm_put_request(struct request *rq)

{

	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

 * or in the process of suspending/resuming
@@ -3159,7 +3159,7 @@ void blk_finish_plug(struct blk_plug *plug) 
}

EXPORT_SYMBOL(blk_finish_plug);



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

/**

 * blk_pm_runtime_init - Block layer runtime PM initialization routine

 * @q: the queue of the device

block/elevator.c

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

}



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static void blk_pm_requeue_request(struct request *rq)

{

	if (rq->q->dev && !(rq->cmd_flags & REQ_PM))

include/linux/blkdev.h

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE