spi: spi-ep93xx: use bits_per_word_mask

This driver supports 16 to 4 bits per work. Set the bits_per_word_mask to allows the spi core to handle validation.

Signed-off-by H Hartley Sweeten <[email protected]>

Cc Ryan Mallon <[email protected]>

Cc Mika Westerberg <[email protected]>

Cc Mark Brown <[email protected]>

Cc Grant Likely <[email protected]>

---
 drivers/spi/spi-ep93xx.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

drivers/spi/spi-ep93xx.c +0 -10

index c633cd0..93ae7b6 100644
@@ -272,12 +272,6 @@ static int ep93xx_spi_setup(struct spi_device *spi)
 	struct ep93xx_spi *espi = spi_master_get_devdata(spi->master);
 	struct ep93xx_spi_chip *chip;
 
-	if (spi->bits_per_word < 4 || spi->bits_per_word > 16) {
-		dev_err(&espi->pdev->dev, "invalid bits per word %d\n",
-			spi->bits_per_word);
-		return -EINVAL;
-	}
-
 	chip = spi_get_ctldata(spi);
 	if (!chip) {
 		dev_dbg(&espi->pdev->dev, "initial setup for %s\n",

@@ -341,10 +335,6 @@ static int ep93xx_spi_transfer(struct spi_device *spi, struct spi_message *msg)
 
 	/* first validate each transfer */
 	list_for_each_entry(t, &msg->transfers, transfer_list) {
-		if (t->bits_per_word) {
-			if (t->bits_per_word < 4 || t->bits_per_word > 16)
-				return -EINVAL;
-		}
 		if (t->speed_hz && t->speed_hz < espi->min_rate)
 				return -EINVAL;
 	}

Quoted 31 lines · H Hartley Sweeten

This driver supports 16 to 4 bits per work. Set the bits_per_word_mask to allows the spi core to handle validation.

Signed-off-by H Hartley Sweeten <[email protected]>

Cc Ryan Mallon <[email protected]>

Cc Mika Westerberg <[email protected]>

Cc Mark Brown <[email protected]>

Cc Grant Likely <[email protected]>

---
 drivers/spi/spi-ep93xx.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

drivers/spi/spi-ep93xx.c +0 -6

index c633cd0..93ae7b6 100644
@@ -272,12 +272,6 @@ static int ep93xx_spi_setup(struct spi_device *spi)
 	struct ep93xx_spi *espi = spi_master_get_devdata(spi->master);
 	struct ep93xx_spi_chip *chip;
 
-	if (spi->bits_per_word < 4 || spi->bits_per_word > 16) {
-		dev_err(&espi->pdev->dev, "invalid bits per word %d\n",
-			spi->bits_per_word);
-		return -EINVAL;
-	}
-
 	chip = spi_get_ctldata(spi);
 	if (!chip) {
 		dev_dbg(&espi->pdev->dev, "initial setup for %s\n",

@@ -341,10 +335,6 @@ static int ep93xx_spi_transfer(struct spi_device *spi, struct spi_message *msg)
 

Quoted 10 lines

drivers/spi/spi-ep93xx.c +0 -4

 	/* first validate each transfer */
 	list_for_each_entry(t, &msg->transfers, transfer_list) {
-		if (t->bits_per_word) {
-			if (t->bits_per_word < 4 || t->bits_per_word > 16)
-				return -EINVAL;
-		}
 		if (t->speed_hz && t->speed_hz < espi->min_rate)
 				return -EINVAL;
 	}

drivers/spi/spi-ep93xx.c static int ep93xx_spi_probe(struct platform_device *pdev) · line 1015

Quoted 4 lines

drivers/spi/spi-ep93xx.c +1 -0

@@ -1022,6 +1012,7 @@ static int ep93xx_spi_probe(struct platform_device *pdev)
 	master->bus_num = pdev->id;
 	master->num_chipselect = info->num_chipselect;
 	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
+	master->bits_per_word_mask = 0xfff8;	/* 16 to 4 bits per word */

Please use SPI_BPW_RANGE_MASK(4, 16) here.

Quoted 1 line · Mika Westerberg

Please use SPI_BPW_RANGE_MASK(4, 16) here.

I thought there was a macro for this, just couldn't find it. I'll fix this.