summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@linux.intel.com>2015-09-15 15:26:19 +0200
committerMark Brown <broonie@kernel.org>2015-09-17 13:33:31 +0200
commit85c1912d44081173b9cd796955959a8201aa7a4e (patch)
tree98f59a7b67089827eb5f4b9acb591c5b90463dcd /drivers/spi
parentLinux 4.3-rc1 (diff)
downloadlinux-85c1912d44081173b9cd796955959a8201aa7a4e.tar.xz
linux-85c1912d44081173b9cd796955959a8201aa7a4e.zip
spi: mpc512x: Call mpc512x_psc_spi_transfer_setup() unconditionally
SPI core validates both bits_per_word and speed_hz transfer parameters and thus the if statement here is needless as it will always call the mpc512x_psc_spi_transfer_setup(). Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-mpc512x-psc.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c
index 1e75341689a6..c3ec46cd9f91 100644
--- a/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@ -302,11 +302,9 @@ static int mpc512x_psc_spi_msg_xfer(struct spi_master *master,
cs_change = 1;
status = 0;
list_for_each_entry(t, &m->transfers, transfer_list) {
- if (t->bits_per_word || t->speed_hz) {
- status = mpc512x_psc_spi_transfer_setup(spi, t);
- if (status < 0)
- break;
- }
+ status = mpc512x_psc_spi_transfer_setup(spi, t);
+ if (status < 0)
+ break;
if (cs_change)
mpc512x_psc_spi_activate_cs(spi);