Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23061f1e authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

spi: Remove duplicate code to set default bits_per_word setting 



The implementation in spi_setup() already set spi->bits_per_word = 8 when
spi->bits_per_word is 0 before calling spi->master->setup.
So we don't need to do it again in setup() callback.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Acked-by: default avatarMarek Vasut <marex@denx.de>
Acked-by: default avatarBarry Song <Baohua.Song@csr.com>
Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 81e53d04

drivers/spi/spi-davinci.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -396,10 +396,6 @@ static int davinci_spi_setup(struct spi_device *spi) 
	dspi = spi_master_get_devdata(spi->master);

	dspi = spi_master_get_devdata(spi->master);

	pdata = &dspi->pdata;

	pdata = &dspi->pdata;





	/* if bits per word length is zero then set it default 8 */

	if (!spi->bits_per_word)

		spi->bits_per_word = 8;



	if (!(spi->mode & SPI_NO_CS)) {

	if (!(spi->mode & SPI_NO_CS)) {

		if ((pdata->chip_sel == NULL) ||

		if ((pdata->chip_sel == NULL) ||

		    (pdata->chip_sel[spi->chip_select] == SPI_INTERN_CS))

		    (pdata->chip_sel[spi->chip_select] == SPI_INTERN_CS))

drivers/spi/spi-fsl-dspi.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -373,9 +373,6 @@ static int dspi_setup(struct spi_device *spi) 
	if (!spi->max_speed_hz)

	if (!spi->max_speed_hz)

		return -EINVAL;

		return -EINVAL;





	if (!spi->bits_per_word)

		spi->bits_per_word = 8;



	return dspi_setup_transfer(spi, NULL);

	return dspi_setup_transfer(spi, NULL);

}

}

drivers/spi/spi-mxs.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -111,14 +111,6 @@ static int mxs_spi_setup_transfer(struct spi_device *dev, 
	return 0;

	return 0;

}

}





static int mxs_spi_setup(struct spi_device *dev)

{

	if (!dev->bits_per_word)

		dev->bits_per_word = 8;



	return 0;

}



static u32 mxs_spi_cs_to_reg(unsigned cs)

static u32 mxs_spi_cs_to_reg(unsigned cs)

{

{

	u32 select = 0;

	u32 select = 0;
@@ -502,7 +494,6 @@ static int mxs_spi_probe(struct platform_device *pdev) 
		return -ENOMEM;

		return -ENOMEM;





	master->transfer_one_message = mxs_spi_transfer_one;

	master->transfer_one_message = mxs_spi_transfer_one;

	master->setup = mxs_spi_setup;

	master->bits_per_word_mask = SPI_BPW_MASK(8);

	master->bits_per_word_mask = SPI_BPW_MASK(8);

	master->mode_bits = SPI_CPOL | SPI_CPHA;

	master->mode_bits = SPI_CPOL | SPI_CPHA;

	master->num_chipselect = 3;

	master->num_chipselect = 3;

drivers/spi/spi-rspi.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -802,8 +802,6 @@ static int rspi_setup(struct spi_device *spi) 
{

{

	struct rspi_data *rspi = spi_master_get_devdata(spi->master);

	struct rspi_data *rspi = spi_master_get_devdata(spi->master);





	if (!spi->bits_per_word)

		spi->bits_per_word = 8;

	rspi->max_speed_hz = spi->max_speed_hz;

	rspi->max_speed_hz = spi->max_speed_hz;





	rspi->spcmd = SPCMD_SSLKP;

	rspi->spcmd = SPCMD_SSLKP;

drivers/spi/spi-sc18is602.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -254,9 +254,6 @@ static int sc18is602_transfer_one(struct spi_master *master, 




static int sc18is602_setup(struct spi_device *spi)

static int sc18is602_setup(struct spi_device *spi)

{

{

	if (!spi->bits_per_word)

		spi->bits_per_word = 8;



	if (spi->mode & ~(SPI_CPHA | SPI_CPOL | SPI_LSB_FIRST))

	if (spi->mode & ~(SPI_CPHA | SPI_CPOL | SPI_LSB_FIRST))

		return -EINVAL;

		return -EINVAL;