@@ -199,48 +199,30 @@ static unsigned short mmc_get_max_segments(struct mmc_host *host)
199
199
host -> max_segs ;
200
200
}
201
201
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 )
210
204
{
211
205
struct mmc_queue_req * mq_rq = req_to_mmc_queue_req (req );
206
+ struct mmc_queue * mq = set -> driver_data ;
212
207
struct mmc_card * card = mq -> card ;
213
208
struct mmc_host * host = card -> host ;
214
209
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 );
216
211
if (!mq_rq -> sg )
217
212
return - ENOMEM ;
218
213
219
214
return 0 ;
220
215
}
221
216
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 )
223
219
{
224
220
struct mmc_queue_req * mq_rq = req_to_mmc_queue_req (req );
225
221
226
222
kfree (mq_rq -> sg );
227
223
mq_rq -> sg = NULL ;
228
224
}
229
225
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
-
244
226
static blk_status_t mmc_mq_queue_rq (struct blk_mq_hw_ctx * hctx ,
245
227
const struct blk_mq_queue_data * bd )
246
228
{
0 commit comments