Commit 97a1abae authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci: Move timer and has_requests functions 



In preparation for removing finish_tasklet, move some functions.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Reviewed-by: default avatarFaiz Abbas <faiz_abbas@ti.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 2e72ab9b

drivers/mmc/host/sdhci.c

+22 −22
Original line number Original line Diff line number Diff line
@@ -446,6 +446,28 @@ static inline void sdhci_led_deactivate(struct sdhci_host *host) 




#endif

#endif





static void sdhci_mod_timer(struct sdhci_host *host, struct mmc_request *mrq,

			    unsigned long timeout)

{

	if (sdhci_data_line_cmd(mrq->cmd))

		mod_timer(&host->data_timer, timeout);

	else

		mod_timer(&host->timer, timeout);

}



static void sdhci_del_timer(struct sdhci_host *host, struct mmc_request *mrq)

{

	if (sdhci_data_line_cmd(mrq->cmd))

		del_timer(&host->data_timer);

	else

		del_timer(&host->timer);

}



static inline bool sdhci_has_requests(struct sdhci_host *host)

{

	return host->cmd || host->data_cmd;

}



/*****************************************************************************\

/*****************************************************************************\

 *                                                                           *

 *                                                                           *

 * Core functions                                                            *

 * Core functions                                                            *
@@ -1316,23 +1338,6 @@ static void sdhci_finish_data(struct sdhci_host *host) 
	}

	}

}

}





static void sdhci_mod_timer(struct sdhci_host *host, struct mmc_request *mrq,

			    unsigned long timeout)

{

	if (sdhci_data_line_cmd(mrq->cmd))

		mod_timer(&host->data_timer, timeout);

	else

		mod_timer(&host->timer, timeout);

}



static void sdhci_del_timer(struct sdhci_host *host, struct mmc_request *mrq)

{

	if (sdhci_data_line_cmd(mrq->cmd))

		del_timer(&host->data_timer);

	else

		del_timer(&host->timer);

}



void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)

void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)

{

{

	int flags;

	int flags;
@@ -2528,11 +2533,6 @@ static void sdhci_pre_req(struct mmc_host *mmc, struct mmc_request *mrq) 
		sdhci_pre_dma_transfer(host, mrq->data, COOKIE_PRE_MAPPED);

		sdhci_pre_dma_transfer(host, mrq->data, COOKIE_PRE_MAPPED);

}

}





static inline bool sdhci_has_requests(struct sdhci_host *host)

{

	return host->cmd || host->data_cmd;

}



static void sdhci_error_out_mrqs(struct sdhci_host *host, int err)

static void sdhci_error_out_mrqs(struct sdhci_host *host, int err)

{

{

	if (host->data_cmd) {

	if (host->data_cmd) {