spi: omap2-mcspi: Remove list_empty checking in omap2_mcspi_transfer_one_message
PATCH 1/2 spi: omap2-mcspi: Remove list_empty checking in omap2_mcspi_transfer_one_message
This checking is done in __spi_validate().
Signed-off-by Axel Lin <[email protected]>
--- drivers/spi/spi-omap2-mcspi.c | 3 --- 1 file changed, 3 deletions(-)
drivers/spi/spi-omap2-mcspi.c +0 -3
@@ -1207,9 +1207,6 @@ static int omap2_mcspi_transfer_one_message(struct spi_master *master, m->actual_length =0 ; m->status =0 ; -/* reject invalid messages and transfers */ -if (list_empty (&m->transfers)) -return -EINVAL ;list_for_each_entry (t, &m->transfers, transfer_list) {const void *tx_buf = t->tx_buf;void *rx_buf = t->rx_buf;
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
PATCH 2/2 spi: omap2-mcspi: Convert to let spi core validate transfer speed
Set master->max_speed_hz and master->min_speed_hz then spi core will handle checking transfer speed. So we can remove the same checking in this driver.
Signed-off-by Axel Lin <[email protected]>
--- drivers/spi/spi-omap2-mcspi.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/spi/spi-omap2-mcspi.c +3 -8
@@ -1212,8 +1212,7 @@ static int omap2_mcspi_transfer_one_message(struct spi_master *master,void *rx_buf = t->rx_buf;unsigned len = t->len; -if (t->speed_hz >OMAP2_MCSPI_MAX_FREQ - || (len && !(rx_buf || tx_buf))) { +if ((len && !(rx_buf || tx_buf))) { dev_dbg(mcspi->dev, "transfer: %d Hz, %d %s%s, %d bpw\n", t->speed_hz, len,
@@ -1222,12 +1221,6 @@ static int omap2_mcspi_transfer_one_message(struct spi_master *master, t->bits_per_word);return -EINVAL ; } -if (t->speed_hz && t->speed_hz < (OMAP2_MCSPI_MAX_FREQ >>15 )) { -dev_dbg (mcspi->dev,"speed_hz %d below minimum %d Hz\n" , - t->speed_hz, -OMAP2_MCSPI_MAX_FREQ >>15 ); -return -EINVAL ; - }if (m->is_dma_mapped || len <DMA_MIN_BYTES )continue ;
@@ -1339,6 +1332,8 @@ static int omap2_mcspi_probe(struct platform_device *pdev) master->transfer_one_message = omap2_mcspi_transfer_one_message; master->cleanup = omap2_mcspi_cleanup; master->dev.of_node = node; + master->max_speed_hz =OMAP2_MCSPI_MAX_FREQ ; + master->min_speed_hz =OMAP2_MCSPI_MAX_FREQ >>15 ;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 1 line · Axel Lin
This checking is done in
__spi_validate().
Applied both, thanks.