From: Sascha Hauer <s.hauer@pengutronix.de>
To: linux-spi@vger.kernel.org
Cc: Mark Brown <broonie@kernel.org>,
kernel@pengutronix.de, linux-kernel@vger.kernel.org,
festevam@gmail.com, Jiada Wang <jiada_wang@mentor.com>,
Sascha Hauer <s.hauer@pengutronix.de>
Subject: [PATCH 1/6] spi: imx: Nothing to do in setupxfer when transfer is NULL
Date: Fri, 2 Jun 2017 07:37:59 +0200 [thread overview]
Message-ID: <20170602053804.3238-2-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20170602053804.3238-1-s.hauer@pengutronix.de>
When the spi_transfer given in spi_imx_setupxfer is NULL then
we have nothing to do. Bail out early in this case so that
we do not have to test for t != NULL multiple times later.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/spi/spi-imx.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index b402530a7a9a..4b5cd0c84450 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -217,9 +217,6 @@ static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi,
if (!master->dma_rx)
return false;
- if (!transfer)
- return false;
-
bpw = transfer->bits_per_word;
if (!bpw)
bpw = spi->bits_per_word;
@@ -895,8 +892,11 @@ static int spi_imx_setupxfer(struct spi_device *spi,
struct spi_imx_config config;
int ret;
- config.bpw = t ? t->bits_per_word : spi->bits_per_word;
- config.speed_hz = t ? t->speed_hz : spi->max_speed_hz;
+ if (!t)
+ return 0;
+
+ config.bpw = t->bits_per_word;
+ config.speed_hz = t->speed_hz;
if (!config.speed_hz)
config.speed_hz = spi->max_speed_hz;
--
2.11.0
next prev parent reply other threads:[~2017-06-02 5:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-02 5:37 spi: i.MX: Some cleanup patches Sascha Hauer
2017-06-02 5:37 ` Sascha Hauer [this message]
2017-06-06 19:07 ` Applied "spi: imx: Nothing to do in setupxfer when transfer is NULL" to the spi tree Mark Brown
2017-06-02 5:38 ` [PATCH 2/6] spi: imx: Drop unnecessary check Sascha Hauer
2017-06-06 19:07 ` Applied "spi: imx: Drop unnecessary check" to the spi tree Mark Brown
2017-06-02 5:38 ` [PATCH 3/6] spi: imx: put struct spi_imx_config members into driver private struct Sascha Hauer
2017-06-06 19:07 ` Applied "spi: imx: put struct spi_imx_config members into driver private struct" to the spi tree Mark Brown
2017-06-02 5:38 ` [PATCH 4/6] spi: imx: drop bogus unnecessary dma config Sascha Hauer
2017-06-06 19:07 ` Applied "spi: imx: drop bogus unnecessary dma config" to the spi tree Mark Brown
2017-06-02 5:38 ` [PATCH 5/6] spi: imx: remove bytes_per_word from private driver struct Sascha Hauer
2017-06-06 19:07 ` Applied "spi: imx: remove bytes_per_word from private driver struct" to the spi tree Mark Brown
2017-06-02 5:38 ` [PATCH 6/6] spi: imx: rename 'bpw' variables Sascha Hauer
2017-06-06 19:07 ` Applied "spi: imx: rename 'bpw' variables" to the spi tree Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170602053804.3238-2-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=broonie@kernel.org \
--cc=festevam@gmail.com \
--cc=jiada_wang@mentor.com \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).