Skip to content

Commit

Permalink
spi/s3c64xx: Convert to bits_per_word_mask
Browse files Browse the repository at this point in the history
The core can do the validation for us.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Mark Brown committed Apr 1, 2013
1 parent f4b97eb commit e761f42
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions drivers/spi/spi-s3c64xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -911,15 +911,6 @@ static int s3c64xx_spi_setup(struct spi_device *spi)

spin_unlock_irqrestore(&sdd->lock, flags);

if (spi->bits_per_word != 8
&& spi->bits_per_word != 16
&& spi->bits_per_word != 32) {
dev_err(&spi->dev, "setup: %dbits/wrd not supported!\n",
spi->bits_per_word);
err = -EINVAL;
goto setup_exit;
}

pm_runtime_get_sync(&sdd->pdev->dev);

/* Check if we can provide the requested rate */
Expand Down Expand Up @@ -1237,6 +1228,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
master->unprepare_transfer_hardware = s3c64xx_spi_unprepare_transfer;
master->num_chipselect = sci->num_cs;
master->dma_alignment = 8;
master->bits_per_word_mask = BIT(32 - 1) | BIT(16 - 1) | BIT(8 - 1);
/* the spi->mode bits understood by this driver: */
master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;

Expand Down

0 comments on commit e761f42

Please sign in to comment.