spi: sc18is602: Move checking chip_select for SC18IS602 to sc18is602_setup
PATCH 1/1 spi: sc18is602: Move checking chip_select for SC18IS602 to sc18is602_setup
So it will be checked when spi device is added onto the spi bus. spi_add_device() calls spi_setup() which then calls spi->master->setup(). No need to check it every time sc18is602_transfer_one() is called.
--- drivers/spi/spi-sc18is602.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
drivers/spi/spi-sc18is602.c +12 -7
@@ -205,12 +205,6 @@ static int sc18is602_transfer_one(struct spi_master *master,struct spi_transfer *t;int status =0 ; -/* SC18IS602 does not support CS2 */ -if (hw->id == sc18is602 && spi->chip_select ==2 ) { - status = -ENXIO ; - goto error; - } - hw->tlen =0 ;list_for_each_entry (t, &m->transfers, transfer_list) {u32 hz = t->speed_hz ? : spi->max_speed_hz;
@@ -238,13 +232,23 @@ static int sc18is602_transfer_one(struct spi_master *master,if (t->delay_usecs)udelay (t->delay_usecs); } -error: m->status = status;spi_finalize_current_message (master);return status; } +static int sc18is602_setup (struct spi_device *spi) +{ +struct sc18is602 *hw =spi_master_get_devdata (spi->master); + +/* SC18IS602 does not support CS2 */ +if (hw->id == sc18is602 && spi->chip_select ==2 ) +return -ENXIO ; + +return 0 ; +} +static int sc18is602_probe (struct i2c_client *client,const struct i2c_device_id *id) {
@@ -298,6 +302,7 @@ 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;
Signature · 8 lines
1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 5 lines · Axel Lin
So it will be checked when spi device is added onto the spi bus.
spi_add_device()callsspi_setup()which then callsspi->master->setup(). No need to check it every timesc18is602_transfer_one()is called.Signed-off-by Axel Lin <[email protected]>
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Mark Brown
AppliedQuoted 3 lines · Axel Lin
So it will be checked when spi device is added onto the spi bus.
spi_add_device()callsspi_setup()which then callsspi->master->setup(). No need to check it every timesc18is602_transfer_one()is called.
Applied, thanks.