Unverified Commit 6ff40f00 authored by Mark Brown's avatar Mark Brown
Browse files

spi: stm32-qspi: Remove unused parameters 

Merge series from patrice.chotard@foss.st.com <patrice.chotard@foss.st.com>:

This series cleans up spi-stm32-qspi driver by removing unused parameters
parents 8d0b5128 6ce7061a

drivers/spi/spi-stm32-qspi.c

+8 −10
Original line number Diff line number Diff line
@@ -299,8 +299,7 @@ static int stm32_qspi_wait_nobusy(struct stm32_qspi *qspi) 
						 STM32_BUSY_TIMEOUT_US);

}



static int stm32_qspi_wait_cmd(struct stm32_qspi *qspi,

			       const struct spi_mem_op *op)

static int stm32_qspi_wait_cmd(struct stm32_qspi *qspi)

{

	u32 cr, sr;

	int err = 0;
@@ -331,8 +330,7 @@ static int stm32_qspi_wait_cmd(struct stm32_qspi *qspi, 
	return err;

}



static int stm32_qspi_wait_poll_status(struct stm32_qspi *qspi,

				       const struct spi_mem_op *op)

static int stm32_qspi_wait_poll_status(struct stm32_qspi *qspi)

{

	u32 cr;
@@ -349,7 +347,7 @@ static int stm32_qspi_wait_poll_status(struct stm32_qspi *qspi, 
	return 0;

}



static int stm32_qspi_get_mode(struct stm32_qspi *qspi, u8 buswidth)

static int stm32_qspi_get_mode(u8 buswidth)

{

	if (buswidth == 4)

		return CCR_BUSWIDTH_4;
@@ -382,11 +380,11 @@ static int stm32_qspi_send(struct spi_mem *mem, const struct spi_mem_op *op) 
	ccr = qspi->fmode;

	ccr |= FIELD_PREP(CCR_INST_MASK, op->cmd.opcode);

	ccr |= FIELD_PREP(CCR_IMODE_MASK,

			  stm32_qspi_get_mode(qspi, op->cmd.buswidth));

			  stm32_qspi_get_mode(op->cmd.buswidth));



	if (op->addr.nbytes) {

		ccr |= FIELD_PREP(CCR_ADMODE_MASK,

				  stm32_qspi_get_mode(qspi, op->addr.buswidth));

				  stm32_qspi_get_mode(op->addr.buswidth));

		ccr |= FIELD_PREP(CCR_ADSIZE_MASK, op->addr.nbytes - 1);

	}
@@ -396,7 +394,7 @@ static int stm32_qspi_send(struct spi_mem *mem, const struct spi_mem_op *op) 


	if (op->data.nbytes) {

		ccr |= FIELD_PREP(CCR_DMODE_MASK,

				  stm32_qspi_get_mode(qspi, op->data.buswidth));

				  stm32_qspi_get_mode(op->data.buswidth));

	}



	writel_relaxed(ccr, qspi->io_base + QSPI_CCR);
@@ -405,7 +403,7 @@ static int stm32_qspi_send(struct spi_mem *mem, const struct spi_mem_op *op) 
		writel_relaxed(op->addr.val, qspi->io_base + QSPI_AR);



	if (qspi->fmode == CCR_FMODE_APM)

		err_poll_status = stm32_qspi_wait_poll_status(qspi, op);

		err_poll_status = stm32_qspi_wait_poll_status(qspi);



	err = stm32_qspi_tx(qspi, op);
@@ -420,7 +418,7 @@ static int stm32_qspi_send(struct spi_mem *mem, const struct spi_mem_op *op) 
		goto abort;



	/* wait end of tx in indirect mode */

	err = stm32_qspi_wait_cmd(qspi, op);

	err = stm32_qspi_wait_cmd(qspi);

	if (err)

		goto abort;