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

Commit 76f67ea9 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Mark Brown
Browse files

spi: omap-100k: Rely on validations done by spi core 



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 a few if statements around per transfer bits_per_word
and speed_hz tests as they evaluate always to true.

Also defaulting word_len to 8 is needless since spi_setup() has already
made sure spi->bits_per_word is 8 in case it is not set.

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-omap-100k.c

+8 −18
Original line number Diff line number Diff line
@@ -244,12 +244,12 @@ static int omap1_spi100k_setup_transfer(struct spi_device *spi, 
{

	struct omap1_spi100k *spi100k = spi_master_get_devdata(spi->master);

	struct omap1_spi100k_cs *cs = spi->controller_state;

	u8 word_len = spi->bits_per_word;

	u8 word_len;



	if (t != NULL && t->bits_per_word)

	if (t != NULL)

		word_len = t->bits_per_word;

	if (!word_len)

		word_len = 8;

	else

		word_len = spi->bits_per_word;



	if (spi->bits_per_word > 32)

		return -EINVAL;
@@ -302,7 +302,6 @@ static int omap1_spi100k_transfer_one_message(struct spi_master *master, 
	struct spi_device *spi = m->spi;

	struct spi_transfer *t = NULL;

	int cs_active = 0;

	int par_override = 0;

	int status = 0;



	list_for_each_entry(t, &m->transfers, transfer_list) {
@@ -310,14 +309,9 @@ static int omap1_spi100k_transfer_one_message(struct spi_master *master, 
			status = -EINVAL;

			break;

		}

		if (par_override || t->speed_hz || t->bits_per_word) {

			par_override = 1;

		status = omap1_spi100k_setup_transfer(spi, t);

		if (status < 0)

			break;

			if (!t->speed_hz && !t->bits_per_word)

				par_override = 0;

		}



		if (!cs_active) {

			omap1_spi100k_force_cs(spi100k, 1);
@@ -347,11 +341,7 @@ static int omap1_spi100k_transfer_one_message(struct spi_master *master, 
		}

	}



	/* Restore defaults if they were overriden */

	if (par_override) {

		par_override = 0;

	status = omap1_spi100k_setup_transfer(spi, NULL);

	}



	if (cs_active)

		omap1_spi100k_force_cs(spi100k, 0);