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

Commit 160f8d06 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Mark Brown
Browse files

spi: omap-uwire: Remove needless bits_per_word and speed_hz tests 



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 two needless tests
from uwire_txrx() and uwire_setup_transfer().

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-uwire.c

+4 −3
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static void uwire_chipselect(struct spi_device *spi, int value) 
static int uwire_txrx(struct spi_device *spi, struct spi_transfer *t)

{

	unsigned	len = t->len;

	unsigned	bits = t->bits_per_word ? : spi->bits_per_word;

	unsigned	bits = t->bits_per_word;

	unsigned	bytes;

	u16		val, w;

	int		status = 0;
@@ -344,9 +344,10 @@ static int uwire_setup_transfer(struct spi_device *spi, struct spi_transfer *t) 
	/* assume it's already enabled */

	rate = clk_get_rate(uwire->ck);



	hz = spi->max_speed_hz;

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

	if (t != NULL)

		hz = t->speed_hz;

	else

		hz = spi->max_speed_hz;



	if (!hz) {

		pr_debug("%s: zero speed?\n", dev_name(&spi->dev));