Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69f7599e authored by Linus Walleij's avatar Linus Walleij Committed by Ulf Hansson
Browse files

mmc: block: Anonymize the drv op data pointer 



We have a data pointer for the ioctl() data, but we need to
pass other data along with the DRV_OP:s, so make this a
void * so it can be reused.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent a814a14e

drivers/mmc/core/block.c

+5 −3
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev, 
		__GFP_RECLAIM);

	idatas[0] = idata;

	req_to_mmc_queue_req(req)->drv_op = MMC_DRV_OP_IOCTL;

	req_to_mmc_queue_req(req)->idata = idatas;

	req_to_mmc_queue_req(req)->drv_op_data = idatas;

	req_to_mmc_queue_req(req)->ioc_count = 1;

	blk_execute_rq(mq->queue, NULL, req, 0);

	ioc_err = req_to_mmc_queue_req(req)->drv_op_result;
@@ -675,7 +675,7 @@ static int mmc_blk_ioctl_multi_cmd(struct block_device *bdev, 
		idata[0]->ic.write_flag ? REQ_OP_DRV_OUT : REQ_OP_DRV_IN,

		__GFP_RECLAIM);

	req_to_mmc_queue_req(req)->drv_op = MMC_DRV_OP_IOCTL;

	req_to_mmc_queue_req(req)->idata = idata;

	req_to_mmc_queue_req(req)->drv_op_data = idata;

	req_to_mmc_queue_req(req)->ioc_count = num_of_cmds;

	blk_execute_rq(mq->queue, NULL, req, 0);

	ioc_err = req_to_mmc_queue_req(req)->drv_op_result;
@@ -1176,6 +1176,7 @@ static void mmc_blk_issue_drv_op(struct mmc_queue *mq, struct request *req) 
	struct mmc_queue_req *mq_rq;

	struct mmc_card *card = mq->card;

	struct mmc_blk_data *md = mq->blkdata;

	struct mmc_blk_ioc_data **idata;

	int ret;

	int i;
@@ -1183,8 +1184,9 @@ static void mmc_blk_issue_drv_op(struct mmc_queue *mq, struct request *req) 


	switch (mq_rq->drv_op) {

	case MMC_DRV_OP_IOCTL:

		idata = mq_rq->drv_op_data;

		for (i = 0, ret = 0; i < mq_rq->ioc_count; i++) {

			ret = __mmc_blk_ioctl_cmd(card, md, mq_rq->idata[i]);

			ret = __mmc_blk_ioctl_cmd(card, md, idata[i]);

			if (ret)

				break;

		}

drivers/mmc/core/queue.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ struct mmc_queue_req { 
	struct mmc_async_req	areq;

	enum mmc_drv_op		drv_op;

	int			drv_op_result;

	struct mmc_blk_ioc_data	**idata;

	void			*drv_op_data;

	unsigned int		ioc_count;

};