From: ChanWoo Lee <[email protected]>
In function mmc_exit_request, the request_queue structure(*q) is not used.
I remove the unnecessary code related to the request_queue structure.
Signed-off-by: ChanWoo Lee <[email protected]>
---
drivers/mmc/core/queue.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c
index cc3261777637..b742385361e4 100644
--- a/drivers/mmc/core/queue.c
+++ b/drivers/mmc/core/queue.c
@@ -219,7 +219,7 @@ static int __mmc_init_request(struct mmc_queue *mq, struct request *req,
return 0;
}
-static void mmc_exit_request(struct request_queue *q, struct request *req)
+static void mmc_exit_request(struct request *req)
{
struct mmc_queue_req *mq_rq = req_to_mmc_queue_req(req);
@@ -236,9 +236,7 @@ static int mmc_mq_init_request(struct blk_mq_tag_set *set, struct request *req,
static void mmc_mq_exit_request(struct blk_mq_tag_set *set, struct request *req,
unsigned int hctx_idx)
{
- struct mmc_queue *mq = set->driver_data;
-
- mmc_exit_request(mq->queue, req);
+ mmc_exit_request(req);
}
static blk_status_t mmc_mq_queue_rq(struct blk_mq_hw_ctx *hctx,
--
2.29.0
On 25/08/21 3:33 am, Chanwoo Lee wrote:
> From: ChanWoo Lee <[email protected]>
>
> In function mmc_exit_request, the request_queue structure(*q) is not used.
> I remove the unnecessary code related to the request_queue structure.
>
> Signed-off-by: ChanWoo Lee <[email protected]>
> ---
> drivers/mmc/core/queue.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c
> index cc3261777637..b742385361e4 100644
> --- a/drivers/mmc/core/queue.c
> +++ b/drivers/mmc/core/queue.c
> @@ -219,7 +219,7 @@ static int __mmc_init_request(struct mmc_queue *mq, struct request *req,
> return 0;
> }
>
> -static void mmc_exit_request(struct request_queue *q, struct request *req)
> +static void mmc_exit_request(struct request *req)
> {
> struct mmc_queue_req *mq_rq = req_to_mmc_queue_req(req);
>
> @@ -236,9 +236,7 @@ static int mmc_mq_init_request(struct blk_mq_tag_set *set, struct request *req,
> static void mmc_mq_exit_request(struct blk_mq_tag_set *set, struct request *req,
> unsigned int hctx_idx)
> {
> - struct mmc_queue *mq = set->driver_data;
> -
> - mmc_exit_request(mq->queue, req);
> + mmc_exit_request(req);
It seems this is the only caller of mmc_exit_request(). It is probably
leftover from before the switch to blk-mq. However we might as well get rid
of it and just put the code directly into mmc_mq_exit_request().
The same applies to mmc_mq_init_request() and __mmc_init_request(), so might
as well tidy up those also.
> }
>
> static blk_status_t mmc_mq_queue_rq(struct blk_mq_hw_ctx *hctx,
>