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

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

mmc: delete is_first_req parameter from pre-request callback 



The void (*pre_req) callback in the struct mmc_host_ops vtable
is passing an argument "is_first_req" indicating whether this is
the first request or not.

None of the in-kernel users use this parameter: instead, since
they all just do variants of dma_map* they use the DMA cookie
to indicate whether a pre* callback has already been done for
a request when they decide how to handle it.

Delete the parameter from the callback and all users, as it is
just pointless cruft.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent e173f891

drivers/mmc/core/core.c

+4 −7
Original line number Diff line number Diff line
@@ -611,18 +611,15 @@ EXPORT_SYMBOL(mmc_is_req_done); 
 *	mmc_pre_req - Prepare for a new request

 *	@host: MMC host to prepare command

 *	@mrq: MMC request to prepare for

 *	@is_first_req: true if there is no previous started request

 *                     that may run in parellel to this call, otherwise false

 *

 *	mmc_pre_req() is called in prior to mmc_start_req() to let

 *	host prepare for the new request. Preparation of a request may be

 *	performed while another request is running on the host.

 */

static void mmc_pre_req(struct mmc_host *host, struct mmc_request *mrq,

		 bool is_first_req)

static void mmc_pre_req(struct mmc_host *host, struct mmc_request *mrq)

{

	if (host->ops->pre_req)

		host->ops->pre_req(host, mrq, is_first_req);

		host->ops->pre_req(host, mrq);

}



/**
@@ -667,7 +664,7 @@ struct mmc_async_req *mmc_start_req(struct mmc_host *host, 


	/* Prepare a new request */

	if (areq)

		mmc_pre_req(host, areq->mrq, !host->areq);

		mmc_pre_req(host, areq->mrq);



	if (host->areq) {

		status = mmc_wait_for_data_req_done(host, host->areq->mrq, areq);
@@ -696,7 +693,7 @@ struct mmc_async_req *mmc_start_req(struct mmc_host *host, 


			/* prepare the request again */

			if (areq)

				mmc_pre_req(host, areq->mrq, !host->areq);

				mmc_pre_req(host, areq->mrq);

		}

	}

drivers/mmc/host/dw_mmc.c

+1 −2
Original line number Diff line number Diff line
@@ -886,8 +886,7 @@ static int dw_mci_pre_dma_transfer(struct dw_mci *host, 
}



static void dw_mci_pre_req(struct mmc_host *mmc,

			   struct mmc_request *mrq,

			   bool is_first_req)

			   struct mmc_request *mrq)

{

	struct dw_mci_slot *slot = mmc_priv(mmc);

	struct mmc_data *data = mrq->data;

drivers/mmc/host/jz4740_mmc.c

+1 −2
Original line number Diff line number Diff line
@@ -320,8 +320,7 @@ static int jz4740_mmc_start_dma_transfer(struct jz4740_mmc_host *host, 
}



static void jz4740_mmc_pre_request(struct mmc_host *mmc,

				   struct mmc_request *mrq,

				   bool is_first_req)

				   struct mmc_request *mrq)

{

	struct jz4740_mmc_host *host = mmc_priv(mmc);

	struct mmc_data *data = mrq->data;

drivers/mmc/host/mmci.c

+1 −2
Original line number Diff line number Diff line
@@ -699,8 +699,7 @@ static void mmci_get_next_data(struct mmci_host *host, struct mmc_data *data) 
	next->dma_chan = NULL;

}



static void mmci_pre_request(struct mmc_host *mmc, struct mmc_request *mrq,

			     bool is_first_req)

static void mmci_pre_request(struct mmc_host *mmc, struct mmc_request *mrq)

{

	struct mmci_host *host = mmc_priv(mmc);

	struct mmc_data *data = mrq->data;

drivers/mmc/host/mtk-sd.c

+1 −2
Original line number Diff line number Diff line
@@ -927,8 +927,7 @@ static void msdc_ops_request(struct mmc_host *mmc, struct mmc_request *mrq) 
		msdc_start_command(host, mrq, mrq->cmd);

}



static void msdc_pre_req(struct mmc_host *mmc, struct mmc_request *mrq,

		bool is_first_req)

static void msdc_pre_req(struct mmc_host *mmc, struct mmc_request *mrq)

{

	struct msdc_host *host = mmc_priv(mmc);

	struct mmc_data *data = mrq->data;