spi: convert drivers to use bits_per_word_mask
Fill in the recently added spi_master.bits_per_word_mask field in as many drivers as possible. Make related cleanups, such as removing any redundant error-checking, or empty setup callbacks. Signed-off-by: Stephen Warren <swarren@wwwdotorg.org> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:

committed by
Mark Brown

parent
2922a8de99
commit
24778be20f
@@ -190,12 +190,6 @@ static int spi_ppc4xx_setupxfer(struct spi_device *spi, struct spi_transfer *t)
|
||||
speed = min(t->speed_hz, spi->max_speed_hz);
|
||||
}
|
||||
|
||||
if (bits_per_word != 8) {
|
||||
dev_err(&spi->dev, "invalid bits-per-word (%d)\n",
|
||||
bits_per_word);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (!speed || (speed > spi->max_speed_hz)) {
|
||||
dev_err(&spi->dev, "invalid speed_hz (%d)\n", speed);
|
||||
return -EINVAL;
|
||||
@@ -229,12 +223,6 @@ static int spi_ppc4xx_setup(struct spi_device *spi)
|
||||
{
|
||||
struct spi_ppc4xx_cs *cs = spi->controller_state;
|
||||
|
||||
if (spi->bits_per_word != 8) {
|
||||
dev_err(&spi->dev, "invalid bits-per-word (%d)\n",
|
||||
spi->bits_per_word);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (!spi->max_speed_hz) {
|
||||
dev_err(&spi->dev, "invalid max_speed_hz (must be non-zero)\n");
|
||||
return -EINVAL;
|
||||
@@ -465,6 +453,7 @@ static int spi_ppc4xx_of_probe(struct platform_device *op)
|
||||
bbp->use_dma = 0;
|
||||
bbp->master->setup = spi_ppc4xx_setup;
|
||||
bbp->master->cleanup = spi_ppc4xx_cleanup;
|
||||
bbp->master->bits_per_word_mask = SPI_BPW_MASK(8);
|
||||
|
||||
/* the spi->mode bits understood by this driver: */
|
||||
bbp->master->mode_bits =
|
||||
|
Reference in New Issue
Block a user