1 files changed, 17 insertions, 28 deletions

diff --git a/drivers/spi/spi-ti-qspi.c b/drivers/spi/spi-ti-qspi.c
index 5044c6198332..64318fcfacf2 100644
--- a/drivers/spi/spi-ti-qspi.c
+++ b/drivers/spi/spi-ti-qspi.c
@@ -94,7 +94,6 @@ struct ti_qspi {
 #define QSPI_FLEN(n)			((n - 1) << 0)
 #define QSPI_WLEN_MAX_BITS		128
 #define QSPI_WLEN_MAX_BYTES		16
-#define QSPI_WLEN_MASK			QSPI_WLEN(QSPI_WLEN_MAX_BITS)
 
 /* STATUS REGISTER */
 #define BUSY				0x01
@@ -225,16 +224,16 @@ static inline int ti_qspi_poll_wc(struct ti_qspi *qspi)
 	return  -ETIMEDOUT;
 }
 
-static int qspi_write_msg(struct ti_qspi *qspi, struct spi_transfer *t,
-			  int count)
+static int qspi_write_msg(struct ti_qspi *qspi, struct spi_transfer *t)
 {
-	int wlen, xfer_len;
+	int wlen, count, xfer_len;
 	unsigned int cmd;
 	const u8 *txbuf;
 	u32 data;
 
 	txbuf = t->tx_buf;
 	cmd = qspi->cmd | QSPI_WR_SNGL;
+	count = t->len;
 	wlen = t->bits_per_word >> 3;	/* in bytes */
 	xfer_len = wlen;
 
@@ -294,10 +293,9 @@ static int qspi_write_msg(struct ti_qspi *qspi, struct spi_transfer *t,
 	return 0;
 }
 
-static int qspi_read_msg(struct ti_qspi *qspi, struct spi_transfer *t,
-			 int count)
+static int qspi_read_msg(struct ti_qspi *qspi, struct spi_transfer *t)
 {
-	int wlen;
+	int wlen, count;
 	unsigned int cmd;
 	u8 *rxbuf;
 
@@ -314,6 +312,7 @@ static int qspi_read_msg(struct ti_qspi *qspi, struct spi_transfer *t,
 		cmd |= QSPI_RD_SNGL;
 		break;
 	}
+	count = t->len;
 	wlen = t->bits_per_word >> 3;	/* in bytes */
 
 	while (count) {
@@ -344,13 +343,12 @@ static int qspi_read_msg(struct ti_qspi *qspi, struct spi_transfer *t,
 	return 0;
 }
 
-static int qspi_transfer_msg(struct ti_qspi *qspi, struct spi_transfer *t,
-			     int count)
+static int qspi_transfer_msg(struct ti_qspi *qspi, struct spi_transfer *t)
 {
 	int ret;
 
 	if (t->tx_buf) {
-		ret = qspi_write_msg(qspi, t, count);
+		ret = qspi_write_msg(qspi, t);
 		if (ret) {
 			dev_dbg(qspi->dev, "Error while writing\n");
 			return ret;
@@ -358,7 +356,7 @@ static int qspi_transfer_msg(struct ti_qspi *qspi, struct spi_transfer *t,
 	}
 
 	if (t->rx_buf) {
-		ret = qspi_read_msg(qspi, t, count);
+		ret = qspi_read_msg(qspi, t);
 		if (ret) {
 			dev_dbg(qspi->dev, "Error while reading\n");
 			return ret;
@@ -375,8 +373,7 @@ static int ti_qspi_start_transfer_one(struct spi_master *master,
 	struct spi_device *spi = m->spi;
 	struct spi_transfer *t;
 	int status = 0, ret;
-	unsigned int frame_len_words, transfer_len_words;
-	int wlen;
+	int frame_length;
 
 	/* setup device control reg */
 	qspi->dc = 0;
@@ -388,38 +385,30 @@ static int ti_qspi_start_transfer_one(struct spi_master *master,
 	if (spi->mode & SPI_CS_HIGH)
 		qspi->dc |= QSPI_CSPOL(spi->chip_select);
 
-	frame_len_words = 0;
-	list_for_each_entry(t, &m->transfers, transfer_list)
-		frame_len_words += t->len / (t->bits_per_word >> 3);
-	frame_len_words = min_t(unsigned int, frame_len_words, QSPI_FRAME);
+	frame_length = (m->frame_length << 3) / spi->bits_per_word;
+
+	frame_length = clamp(frame_length, 0, QSPI_FRAME);
 
 	/* setup command reg */
 	qspi->cmd = 0;
 	qspi->cmd |= QSPI_EN_CS(spi->chip_select);
-	qspi->cmd |= QSPI_FLEN(frame_len_words);
+	qspi->cmd |= QSPI_FLEN(frame_length);
 
 	ti_qspi_write(qspi, qspi->dc, QSPI_SPI_DC_REG);
 
 	mutex_lock(&qspi->list_lock);
 
 	list_for_each_entry(t, &m->transfers, transfer_list) {
-		qspi->cmd = ((qspi->cmd & ~QSPI_WLEN_MASK) |
-			     QSPI_WLEN(t->bits_per_word));
-
-		wlen = t->bits_per_word >> 3;
-		transfer_len_words = min(t->len / wlen, frame_len_words);
+		qspi->cmd |= QSPI_WLEN(t->bits_per_word);
 
-		ret = qspi_transfer_msg(qspi, t, transfer_len_words * wlen);
+		ret = qspi_transfer_msg(qspi, t);
 		if (ret) {
 			dev_dbg(qspi->dev, "transfer message failed\n");
 			mutex_unlock(&qspi->list_lock);
 			return -EINVAL;
 		}
 
-		m->actual_length += transfer_len_words * wlen;
-		frame_len_words -= transfer_len_words;
-		if (frame_len_words == 0)
-			break;
+		m->actual_length += t->len;
 	}
 
 	mutex_unlock(&qspi->list_lock);