redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

spi: pic32: Set proper bits_per_word_mask 

This driver only supports 8/16/32 bits_per_word, so set
master->bits_per_word_mask accordingly. With this change, we can remove
the spi->bits_per_word checking in pic32_spi_setup as it's done by spi
core.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
steinar/wifi_calib_4_9_kernel
Axel Lin 2016-04-26 07:31:15 +08:00 committed by Mark Brown
parent 1bcb9f8ceb
commit 2452ee2525
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/spi/spi-pic32.c
View File

@ -592,16 +592,6 @@ static int pic32_spi_setup(struct spi_device *spi)
return -EINVAL;
}
switch (spi->bits_per_word) {
case 8:
case 16:
case 32:
break;
default:
dev_err(&spi->dev, "Invalid bits_per_word defined\n");
return -EINVAL;
}
/* PIC32 spi controller can drive /CS during transfer depending
* on tx fifo fill-level. /CS will stay asserted as long as TX
* fifo is non-empty, else will be deasserted indicating
@ -791,7 +781,8 @@ static int pic32_spi_probe(struct platform_device *pdev)
master->setup = pic32_spi_setup;
master->cleanup = pic32_spi_cleanup;
master->flags = SPI_MASTER_MUST_TX | SPI_MASTER_MUST_RX;
master->bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 32);
master->bits_per_word_mask = SPI_BPW_MASK(8) | SPI_BPW_MASK(16) |
SPI_BPW_MASK(32);
master->transfer_one = pic32_spi_one_transfer;
master->prepare_message = pic32_spi_prepare_message;
master->unprepare_message = pic32_spi_unprepare_message;