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

Commit 7db3028e authored by Linus Walleij's avatar Linus Walleij Committed by Ulf Hansson
Browse files

mmc: block: rename data to blkdata 



The struct mmc_blk_request contains an opaque void *data that
is actually only used to store a pointer to a per-request
struct mmc_blk_data. This is confusing, so rename the member
to blkdata and forward-declare the block.c local struct.

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

drivers/mmc/card/block.c

+10 −10
Original line number Diff line number Diff line
@@ -1154,7 +1154,7 @@ static inline void mmc_blk_reset_success(struct mmc_blk_data *md, int type) 


int mmc_access_rpmb(struct mmc_queue *mq)

{

	struct mmc_blk_data *md = mq->data;

	struct mmc_blk_data *md = mq->blkdata;

	/*

	 * If this is a RPMB partition access, return ture

	 */
@@ -1166,7 +1166,7 @@ int mmc_access_rpmb(struct mmc_queue *mq) 


static int mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req)

{

	struct mmc_blk_data *md = mq->data;

	struct mmc_blk_data *md = mq->blkdata;

	struct mmc_card *card = md->queue.card;

	unsigned int from, nr, arg;

	int err = 0, type = MMC_BLK_DISCARD;
@@ -1210,7 +1210,7 @@ static int mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req) 
static int mmc_blk_issue_secdiscard_rq(struct mmc_queue *mq,

				       struct request *req)

{

	struct mmc_blk_data *md = mq->data;

	struct mmc_blk_data *md = mq->blkdata;

	struct mmc_card *card = md->queue.card;

	unsigned int from, nr, arg;

	int err = 0, type = MMC_BLK_SECDISCARD;
@@ -1276,7 +1276,7 @@ static int mmc_blk_issue_secdiscard_rq(struct mmc_queue *mq, 


static int mmc_blk_issue_flush(struct mmc_queue *mq, struct request *req)

{

	struct mmc_blk_data *md = mq->data;

	struct mmc_blk_data *md = mq->blkdata;

	struct mmc_card *card = md->queue.card;

	int ret = 0;
@@ -1490,7 +1490,7 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq, 
	u32 readcmd, writecmd;

	struct mmc_blk_request *brq = &mqrq->brq;

	struct request *req = mqrq->req;

	struct mmc_blk_data *md = mq->data;

	struct mmc_blk_data *md = mq->blkdata;

	bool do_data_tag;



	/*
@@ -1663,7 +1663,7 @@ static u8 mmc_blk_prep_packed_list(struct mmc_queue *mq, struct request *req) 
	struct request_queue *q = mq->queue;

	struct mmc_card *card = mq->card;

	struct request *cur = req, *next = NULL;

	struct mmc_blk_data *md = mq->data;

	struct mmc_blk_data *md = mq->blkdata;

	struct mmc_queue_req *mqrq = mq->mqrq_cur;

	bool en_rel_wr = card->ext_csd.rel_param & EXT_CSD_WR_REL_PARAM_EN;

	unsigned int req_sectors = 0, phys_segments = 0;
@@ -1784,7 +1784,7 @@ static void mmc_blk_packed_hdr_wrq_prep(struct mmc_queue_req *mqrq, 
	struct mmc_blk_request *brq = &mqrq->brq;

	struct request *req = mqrq->req;

	struct request *prq;

	struct mmc_blk_data *md = mq->data;

	struct mmc_blk_data *md = mq->blkdata;

	struct mmc_packed *packed = mqrq->packed;

	bool do_rel_wr, do_data_tag;

	__le32 *packed_cmd_hdr;
@@ -1955,7 +1955,7 @@ static void mmc_blk_revert_packed_req(struct mmc_queue *mq, 


static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc)

{

	struct mmc_blk_data *md = mq->data;

	struct mmc_blk_data *md = mq->blkdata;

	struct mmc_card *card = md->queue.card;

	struct mmc_blk_request *brq = &mq->mqrq_cur->brq;

	int ret = 1, disable_multi = 0, retry = 0, type, retune_retry_done = 0;
@@ -2148,7 +2148,7 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) 
int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)

{

	int ret;

	struct mmc_blk_data *md = mq->data;

	struct mmc_blk_data *md = mq->blkdata;

	struct mmc_card *card = md->queue.card;

	struct mmc_host *host = card->host;

	unsigned long flags;
@@ -2266,7 +2266,7 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, 
	if (ret)

		goto err_putdisk;



	md->queue.data = md;

	md->queue.blkdata = md;



	md->disk->major	= MMC_BLOCK_MAJOR;

	md->disk->first_minor = devidx * perdev_minors;

drivers/mmc/card/queue.h

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ static inline bool mmc_req_is_special(struct request *req) 


struct request;

struct task_struct;

struct mmc_blk_data;



struct mmc_blk_request {

	struct mmc_request	mrq;
@@ -57,7 +58,7 @@ struct mmc_queue { 
	unsigned int		flags;

#define MMC_QUEUE_SUSPENDED	(1 << 0)

#define MMC_QUEUE_NEW_REQUEST	(1 << 1)

	void			*data;

	struct mmc_blk_data	*blkdata;

	struct request_queue	*queue;

	struct mmc_queue_req	mqrq[2];

	struct mmc_queue_req	*mqrq_cur;