Commit c5dbed92 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Ulf Hansson
Browse files

mmc: mmc_spi: Use write_or_read temporary variable in mmc_spi_data_do() 



Use write_or_read temporary variable in mmc_spi_data_do() to deduplicate
the conditional code.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20211206115218.73874-2-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 1fdafaae

drivers/mmc/host/mmc_spi.c

+4 −8
Original line number Diff line number Diff line
@@ -859,14 +859,14 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd, 
	struct spi_device	*spi = host->spi;

	struct device		*dma_dev = host->dma_dev;

	struct spi_transfer	*t;

	enum dma_data_direction	direction;

	enum dma_data_direction	direction = mmc_get_dma_dir(data);

	struct scatterlist	*sg;

	unsigned		n_sg;

	bool			multiple = (data->blocks > 1);

	const char		*write_or_read = (direction == DMA_TO_DEVICE) ? "write" : "read";

	u32			clock_rate;

	unsigned long		timeout;



	direction = mmc_get_dma_dir(data);

	mmc_spi_setup_data_message(host, multiple, direction);

	t = &host->t;
@@ -921,9 +921,7 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd, 
		while (length) {

			t->len = min(length, blk_size);



			dev_dbg(&host->spi->dev, "    %s block, %d bytes\n",

				(direction == DMA_TO_DEVICE) ? "write" : "read",

				t->len);

			dev_dbg(&spi->dev, "    %s block, %d bytes\n", write_or_read, t->len);



			if (direction == DMA_TO_DEVICE)

				status = mmc_spi_writeblock(host, t, timeout);
@@ -948,9 +946,7 @@ mmc_spi_data_do(struct mmc_spi_host *host, struct mmc_command *cmd, 


		if (status < 0) {

			data->error = status;

			dev_dbg(&spi->dev, "%s status %d\n",

				(direction == DMA_TO_DEVICE) ? "write" : "read",

				status);

			dev_dbg(&spi->dev, "%s status %d\n", write_or_read, status);

			break;

		}

	}