diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index b2810a2b8de5..2f2e908fb850 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -4010,13 +4010,10 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message)
 				xfer->tx_nbits != SPI_NBITS_QUAD)
 				return -EINVAL;
 			if ((xfer->tx_nbits == SPI_NBITS_DUAL) &&
-				!(spi->mode & (SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL)))
+				!(spi->mode & (SPI_TX_DUAL | SPI_TX_QUAD)))
 				return -EINVAL;
 			if ((xfer->tx_nbits == SPI_NBITS_QUAD) &&
-				!(spi->mode & (SPI_TX_QUAD | SPI_TX_OCTAL)))
-				return -EINVAL;
-			if ((xfer->tx_nbits == SPI_NBITS_OCTAL) &&
-				!(spi->mode & SPI_TX_OCTAL))
+				!(spi->mode & SPI_TX_QUAD))
 				return -EINVAL;
 		}
 		/* Check transfer rx_nbits */
@@ -4028,13 +4025,10 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message)
 				xfer->rx_nbits != SPI_NBITS_QUAD)
 				return -EINVAL;
 			if ((xfer->rx_nbits == SPI_NBITS_DUAL) &&
-				!(spi->mode & (SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL)))
+				!(spi->mode & (SPI_RX_DUAL | SPI_RX_QUAD)))
 				return -EINVAL;
 			if ((xfer->rx_nbits == SPI_NBITS_QUAD) &&
-				!(spi->mode & (SPI_RX_QUAD | SPI_RX_OCTAL)))
-				return -EINVAL;
-			if ((xfer->rx_nbits == SPI_NBITS_OCTAL) &&
-				!(spi->mode & SPI_RX_OCTAL))
+				!(spi->mode & SPI_RX_QUAD))
 				return -EINVAL;
 		}