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

Commit 690f90b6 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Ulf Hansson
Browse files

mmc: meson-gx: improve meson_mmc_irq_thread 



Remove unneeded variable ret and simplify the if block.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Acked-by: default avatarKevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 5da86887

drivers/mmc/host/meson-gx-mmc.c

+6 −9
Original line number Diff line number Diff line
@@ -666,7 +666,6 @@ static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id) 
	struct mmc_command *cmd = host->cmd;

	struct mmc_data *data;

	unsigned int xfer_bytes;

	int ret = IRQ_HANDLED;



	if (WARN_ON(!mrq))

		return IRQ_NONE;
@@ -675,15 +674,13 @@ static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id) 
		return IRQ_NONE;



	data = cmd->data;

	if (data) {

	if (data && data->flags & MMC_DATA_READ) {

		xfer_bytes = data->blksz * data->blocks;

		if (data->flags & MMC_DATA_READ) {

		WARN_ON(xfer_bytes > host->bounce_buf_size);

		sg_copy_from_buffer(data->sg, data->sg_len,

				    host->bounce_buf, xfer_bytes);

		data->bytes_xfered = xfer_bytes;

	}

	}



	meson_mmc_read_resp(host->mmc, cmd);

	if (!data || !data->stop || mrq->sbc)
@@ -691,7 +688,7 @@ static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id) 
	else

		meson_mmc_start_cmd(host->mmc, data->stop);



	return ret;

	return IRQ_HANDLED;

}



/*