diff mbox

Applied "spi: atmel: Remove needless bits_per_word and speed_hz tests" to the asoc tree

Message ID E1Zcd6t-0006J1-P7@finisterre (mailing list archive)
State Not Applicable
Commit 3f8958cf9aaaac8a2bfc7417cb87db757eeb4465
Headers show

Commit Message

Mark Brown Sept. 17, 2015, 5:36 p.m. UTC 
The patch

   spi: atmel: Remove needless bits_per_word and speed_hz tests

has been applied to the asoc tree at

   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

From 3f8958cf9aaaac8a2bfc7417cb87db757eeb4465 Mon Sep 17 00:00:00 2001
From: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Date: Tue, 15 Sep 2015 16:26:22 +0300
Subject: [PATCH] spi: atmel: 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 makes possible to remove two if
statements and remove one code block that is never executed.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 drivers/spi/spi-atmel.c | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

Comments

Jarkko Nikula Sept. 24, 2015, 12:07 p.m. UTC | #1 
Hi

On 09/17/2015 08:36 PM, Mark Brown wrote:
> The patch
>
>     spi: atmel: Remove needless bits_per_word and speed_hz tests
>
> has been applied to the asoc tree at
>
>     git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
>
...
>  From 3f8958cf9aaaac8a2bfc7417cb87db757eeb4465 Mon Sep 17 00:00:00 2001
> From: Jarkko Nikula <jarkko.nikula@linux.intel.com>
> Date: Tue, 15 Sep 2015 16:26:22 +0300
> Subject: [PATCH] spi: atmel: Remove needless bits_per_word and speed_hz tests
>
Did this one get lost? I don't find commit id above either from spi.git 
or sound.git (I guess sound.git was accidental). Other patches from the 
patch set are in spi.git and I can resend this if needed.
Mark Brown Sept. 24, 2015, 5:18 p.m. UTC | #2 
On Thu, Sep 24, 2015 at 03:07:16PM +0300, Jarkko Nikula wrote:

> Did this one get lost? I don't find commit id above either from spi.git or
> sound.git (I guess sound.git was accidental). Other patches from the patch
> set are in spi.git and I can resend this if needed.

Please resend any patches you think are missing in my tree.
diff mbox

Patch

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index bf9ed38..1cc1f1e 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -871,14 +871,7 @@  static int atmel_spi_set_xfer_speed(struct atmel_spi *as,
 	 * Calculate the lowest divider that satisfies the
 	 * constraint, assuming div32/fdiv/mbz == 0.
 	 */
-	if (xfer->speed_hz)
-		scbr = DIV_ROUND_UP(bus_hz, xfer->speed_hz);
-	else
-		/*
-		 * This can happend if max_speed is null.
-		 * In this case, we set the lowest possible speed
-		 */
-		scbr = 0xff;
+	scbr = DIV_ROUND_UP(bus_hz, xfer->speed_hz);
 
 	/*
 	 * If the resulting divider doesn't fit into the
@@ -1300,14 +1293,12 @@  static int atmel_spi_one_transfer(struct spi_master *master,
 		return -EINVAL;
 	}
 
-	if (xfer->bits_per_word) {
-		asd = spi->controller_state;
-		bits = (asd->csr >> 4) & 0xf;
-		if (bits != xfer->bits_per_word - 8) {
-			dev_dbg(&spi->dev,
+	asd = spi->controller_state;
+	bits = (asd->csr >> 4) & 0xf;
+	if (bits != xfer->bits_per_word - 8) {
+		dev_dbg(&spi->dev,
 			"you can't yet change bits_per_word in transfers\n");
-			return -ENOPROTOOPT;
-		}
+		return -ENOPROTOOPT;
 	}
 
 	/*