spi: orion: Convert to let spi core validate xfer->bits_per_word
PATCH 1/1 spi: orion: Convert to let spi core validate xfer->bits_per_word
Set bits_per_word_mask so spi core will reject transfers that attempt to use an unsupported bits_per_word value.
Signed-off-by Axel Lin <[email protected]>
--- drivers/spi/spi-orion.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-)
drivers/spi/spi-orion.c +9 -18
@@ -74,23 +74,6 @@ orion_spi_clrbits(struct orion_spi *orion_spi, u32 reg, u32 mask)writel (val, reg_addr); } -static int orion_spi_set_transfer_size (struct orion_spi *orion_spi,int size) -{ -if (size ==16 ) { -orion_spi_setbits (orion_spi,ORION_SPI_IF_CONFIG_REG , -ORION_SPI_IF_8_16_BIT_MODE ); - }else if (size ==8 ) { -orion_spi_clrbits (orion_spi,ORION_SPI_IF_CONFIG_REG , -ORION_SPI_IF_8_16_BIT_MODE ); - }else { -pr_debug ("Bad bits per word value %d (only 8 or 16 are allowed).\n" , - size); -return -EINVAL ; - } - -return 0 ; -} -static int orion_spi_baudrate_set (struct spi_device *spi,unsigned int speed) {u32 tclk_hz;
@@ -169,7 +152,14 @@ orion_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t)if (rc)return rc; -return orion_spi_set_transfer_size (orion_spi, bits_per_word); +if (bits_per_word ==16 ) +orion_spi_setbits (orion_spi,ORION_SPI_IF_CONFIG_REG , +ORION_SPI_IF_8_16_BIT_MODE ); +else +orion_spi_clrbits (orion_spi,ORION_SPI_IF_CONFIG_REG , +ORION_SPI_IF_8_16_BIT_MODE ); + +return 0 ; }static void orion_spi_set_cs (struct orion_spi *orion_spi,int enable)
@@ -425,6 +415,7 @@ static int orion_spi_probe(struct platform_device *pdev) master->setup = orion_spi_setup; master->transfer_one_message = orion_spi_transfer_one_message; master->num_chipselect =ORION_NUM_CHIPSELECTS ; + master->bits_per_word_mask =SPI_BPW_MASK (8 ) |SPI_BPW_MASK (16 );platform_set_drvdata (pdev, master);
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
Mark Brown
AppliedQuoted 2 lines · Axel Lin
Set
bits_per_word_maskso spi core will reject transfers that attempt to use an unsupportedbits_per_wordvalue.
Applied, thanks.