aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-01-20 10:18:45 -0500
committerMark Brown <broonie@linaro.org>2014-02-03 07:24:31 -0500
commit589f6a90e6c5cda51ecb89799c5bff4074e9ef77 (patch)
tree5923e71a6a8fa7a99a82950b389dbfb652b529b2
parent38dbfb59d1175ef458d006556061adeaa8751b72 (diff)
spi: sc18is602: Remove sc18is602_setup() because it is done by spi core
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> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--drivers/spi/spi-sc18is602.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/spi/spi-sc18is602.c b/drivers/spi/spi-sc18is602.c
index 121c2e1dea36..b3ac776def9b 100644
--- a/drivers/spi/spi-sc18is602.c
+++ b/drivers/spi/spi-sc18is602.c
@@ -245,14 +245,6 @@ error:
245 return status; 245 return status;
246} 246}
247 247
248static int sc18is602_setup(struct spi_device *spi)
249{
250 if (spi->mode & ~(SPI_CPHA | SPI_CPOL | SPI_LSB_FIRST))
251 return -EINVAL;
252
253 return sc18is602_check_transfer(spi, NULL, 0);
254}
255
256static int sc18is602_probe(struct i2c_client *client, 248static int sc18is602_probe(struct i2c_client *client,
257 const struct i2c_device_id *id) 249 const struct i2c_device_id *id)
258{ 250{
@@ -306,7 +298,6 @@ static int sc18is602_probe(struct i2c_client *client,
306 master->bus_num = client->adapter->nr; 298 master->bus_num = client->adapter->nr;
307 master->mode_bits = SPI_CPHA | SPI_CPOL | SPI_LSB_FIRST; 299 master->mode_bits = SPI_CPHA | SPI_CPOL | SPI_LSB_FIRST;
308 master->bits_per_word_mask = SPI_BPW_MASK(8); 300 master->bits_per_word_mask = SPI_BPW_MASK(8);
309 master->setup = sc18is602_setup;
310 master->transfer_one_message = sc18is602_transfer_one; 301 master->transfer_one_message = sc18is602_transfer_one;
311 master->dev.of_node = np; 302 master->dev.of_node = np;
312 303