Skip to content

Commit f80c8e6

Browse files
ChanWoo Leestorulf
authored andcommitted
mmc: queue: Remove unused parameters(request_queue)
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]> Acked-by: Adrian Hunter <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Ulf Hansson <[email protected]>
1 parent dba914b commit f80c8e6

File tree

1 file changed

+6
-24
lines changed

1 file changed

+6
-24
lines changed

drivers/mmc/core/queue.c

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -199,48 +199,30 @@ static unsigned short mmc_get_max_segments(struct mmc_host *host)
199199
host->max_segs;
200200
}
201201

202-
/**
203-
* mmc_init_request() - initialize the MMC-specific per-request data
204-
* @mq: the request queue
205-
* @req: the request
206-
* @gfp: memory allocation policy
207-
*/
208-
static int __mmc_init_request(struct mmc_queue *mq, struct request *req,
209-
gfp_t gfp)
202+
static int mmc_mq_init_request(struct blk_mq_tag_set *set, struct request *req,
203+
unsigned int hctx_idx, unsigned int numa_node)
210204
{
211205
struct mmc_queue_req *mq_rq = req_to_mmc_queue_req(req);
206+
struct mmc_queue *mq = set->driver_data;
212207
struct mmc_card *card = mq->card;
213208
struct mmc_host *host = card->host;
214209

215-
mq_rq->sg = mmc_alloc_sg(mmc_get_max_segments(host), gfp);
210+
mq_rq->sg = mmc_alloc_sg(mmc_get_max_segments(host), GFP_KERNEL);
216211
if (!mq_rq->sg)
217212
return -ENOMEM;
218213

219214
return 0;
220215
}
221216

222-
static void mmc_exit_request(struct request_queue *q, struct request *req)
217+
static void mmc_mq_exit_request(struct blk_mq_tag_set *set, struct request *req,
218+
unsigned int hctx_idx)
223219
{
224220
struct mmc_queue_req *mq_rq = req_to_mmc_queue_req(req);
225221

226222
kfree(mq_rq->sg);
227223
mq_rq->sg = NULL;
228224
}
229225

230-
static int mmc_mq_init_request(struct blk_mq_tag_set *set, struct request *req,
231-
unsigned int hctx_idx, unsigned int numa_node)
232-
{
233-
return __mmc_init_request(set->driver_data, req, GFP_KERNEL);
234-
}
235-
236-
static void mmc_mq_exit_request(struct blk_mq_tag_set *set, struct request *req,
237-
unsigned int hctx_idx)
238-
{
239-
struct mmc_queue *mq = set->driver_data;
240-
241-
mmc_exit_request(mq->queue, req);
242-
}
243-
244226
static blk_status_t mmc_mq_queue_rq(struct blk_mq_hw_ctx *hctx,
245227
const struct blk_mq_queue_data *bd)
246228
{

0 commit comments

Comments
 (0)