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

Commit 0ed36990 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Mark Brown
Browse files

spi: dw: Remove needless if statements 



SPI core validates both bits_per_word and speed_hz transfer parameters and
defaults to spi->bits_per_word and spi->max_speed_hz in case these per
transfer parameters are not set. This allows to remove related if
statements as they evaluate always to true and reduce indentation.

Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6ff33f39

drivers/spi/spi-dw.c

+18 −23
Original line number Diff line number Diff line
@@ -309,9 +309,7 @@ static int dw_spi_transfer_one(struct spi_master *master, 
	cr0 = chip->cr0;



	/* Handle per transfer options for bpw and speed */

	if (transfer->speed_hz) {

	speed = chip->speed_hz;



	if ((transfer->speed_hz != speed) || !chip->clk_div) {

		speed = transfer->speed_hz;
@@ -323,8 +321,6 @@ static int dw_spi_transfer_one(struct spi_master *master, 


		spi_set_clk(dws, chip->clk_div);

	}

	}

	if (transfer->bits_per_word) {

	if (transfer->bits_per_word == 8) {

		dws->n_bytes = 1;

		dws->dma_width = 1;
@@ -336,7 +332,6 @@ static int dw_spi_transfer_one(struct spi_master *master, 
		| (chip->type << SPI_FRF_OFFSET)

		| (spi->mode << SPI_MODE_OFFSET)

		| (chip->tmode << SPI_TMOD_OFFSET);

	}



	/*

	 * Adjust transfer mode if necessary. Requires platform dependent