All of lore.kernel.org
 help / color / mirror / Atom feed
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 2/6] spi: imx: Drop unnecessary check
Date: Fri,  2 Jun 2017 07:38:00 +0200	[thread overview]
Message-ID: <20170602053804.3238-3-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20170602053804.3238-1-s.hauer@pengutronix.de>

__spi_validate makes sure that every transfer has a valid bits_per_word
and speed_hz setting. We do not need to fallback to values from the
spi_device.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/spi/spi-imx.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 4b5cd0c84450..e3bc3d51a2d6 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -218,8 +218,6 @@ static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi,
 		return false;
 
 	bpw = transfer->bits_per_word;
-	if (!bpw)
-		bpw = spi->bits_per_word;
 
 	bpw = spi_imx_bytes_per_word(bpw);
 
@@ -898,11 +896,6 @@ static int spi_imx_setupxfer(struct spi_device *spi,
 	config.bpw = t->bits_per_word;
 	config.speed_hz  = t->speed_hz;
 
-	if (!config.speed_hz)
-		config.speed_hz = spi->max_speed_hz;
-	if (!config.bpw)
-		config.bpw = spi->bits_per_word;
-
 	/* Initialize the functions for transfer */
 	if (config.bpw <= 8) {
 		spi_imx->rx = spi_imx_buf_rx_u8;
-- 
2.11.0

WARNING: multiple messages have this Message-ID (diff)
From: Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
To: linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
	kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	festevam-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
	Jiada Wang <jiada_wang-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org>,
	Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
Subject: [PATCH 2/6] spi: imx: Drop unnecessary check
Date: Fri,  2 Jun 2017 07:38:00 +0200	[thread overview]
Message-ID: <20170602053804.3238-3-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20170602053804.3238-1-s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>

__spi_validate makes sure that every transfer has a valid bits_per_word
and speed_hz setting. We do not need to fallback to values from the
spi_device.

Signed-off-by: Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
---
 drivers/spi/spi-imx.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 4b5cd0c84450..e3bc3d51a2d6 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -218,8 +218,6 @@ static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi,
 		return false;
 
 	bpw = transfer->bits_per_word;
-	if (!bpw)
-		bpw = spi->bits_per_word;
 
 	bpw = spi_imx_bytes_per_word(bpw);
 
@@ -898,11 +896,6 @@ static int spi_imx_setupxfer(struct spi_device *spi,
 	config.bpw = t->bits_per_word;
 	config.speed_hz  = t->speed_hz;
 
-	if (!config.speed_hz)
-		config.speed_hz = spi->max_speed_hz;
-	if (!config.bpw)
-		config.bpw = spi->bits_per_word;
-
 	/* Initialize the functions for transfer */
 	if (config.bpw <= 8) {
 		spi_imx->rx = spi_imx_buf_rx_u8;
-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2017-06-02  5:38 UTC|newest]

Thread overview: 19+ 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
2017-06-02  5:37 ` [PATCH 1/6] spi: imx: Nothing to do in setupxfer when transfer is NULL Sascha Hauer
2017-06-02  5:37   ` Sascha Hauer
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-06 19:07     ` Mark Brown
2017-06-02  5:38 ` Sascha Hauer [this message]
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-02  5:38   ` 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
2017-06-06 19:07     ` 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-3-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.