diff mbox

spi: sc18is602: Remove sc18is602_setup() because it is done by spi core

Message ID 1390231125.11756.1.camel@phoenix (mailing list archive)
State Accepted
Commit 589f6a90e6c5cda51ecb89799c5bff4074e9ef77
Headers show

Commit Message

Axel Lin Jan. 20, 2014, 3:18 p.m. UTC
The checking for spi->mode is done in the implementation of spi_setup().
Calling sc18is602_check_transfer(spi, NULL, 0) is pointless because
the code is equivent to checking if spi->max_speed_hz is 0.
Note, sc18is602_check_transfer actually allows spi->max_speed_hz is 0
if t->speed_hz is set. So return error in sc18is602_setup() when
spi->max_speed_hz is 0 does not make sense.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
 drivers/spi/spi-sc18is602.c | 9 ---------
 1 file changed, 9 deletions(-)

Comments

Guenter Roeck Jan. 20, 2014, 4:24 p.m. UTC | #1
On 01/20/2014 07:18 AM, Axel Lin wrote:
> The checking for spi->mode is done in the implementation of spi_setup().
> Calling sc18is602_check_transfer(spi, NULL, 0) is pointless because
> the code is equivent to checking if spi->max_speed_hz is 0.
> Note, sc18is602_check_transfer actually allows spi->max_speed_hz is 0
> if t->speed_hz is set. So return error in sc18is602_setup() when
> spi->max_speed_hz is 0 does not make sense.
>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>

Acked-by: Guenter Roeck <linux@roeck-us.net>

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Mark Brown Jan. 20, 2014, 6:33 p.m. UTC | #2
On Mon, Jan 20, 2014 at 11:18:45PM +0800, Axel Lin wrote:
> The checking for spi->mode is done in the implementation of spi_setup().
> Calling sc18is602_check_transfer(spi, NULL, 0) is pointless because
> the code is equivent to checking if spi->max_speed_hz is 0.
> Note, sc18is602_check_transfer actually allows spi->max_speed_hz is 0
> if t->speed_hz is set. So return error in sc18is602_setup() when
> spi->max_speed_hz is 0 does not make sense.

Applied, thanks.
diff mbox

Patch

diff --git a/drivers/spi/spi-sc18is602.c b/drivers/spi/spi-sc18is602.c
index 121c2e1..b3ac776 100644
--- a/drivers/spi/spi-sc18is602.c
+++ b/drivers/spi/spi-sc18is602.c
@@ -245,14 +245,6 @@  error:
 	return status;
 }
 
-static int sc18is602_setup(struct spi_device *spi)
-{
-	if (spi->mode & ~(SPI_CPHA | SPI_CPOL | SPI_LSB_FIRST))
-		return -EINVAL;
-
-	return sc18is602_check_transfer(spi, NULL, 0);
-}
-
 static int sc18is602_probe(struct i2c_client *client,
 			   const struct i2c_device_id *id)
 {
@@ -306,7 +298,6 @@  static int sc18is602_probe(struct i2c_client *client,
 	master->bus_num = client->adapter->nr;
 	master->mode_bits = SPI_CPHA | SPI_CPOL | SPI_LSB_FIRST;
 	master->bits_per_word_mask = SPI_BPW_MASK(8);
-	master->setup = sc18is602_setup;
 	master->transfer_one_message = sc18is602_transfer_one;
 	master->dev.of_node = np;