[PATCH 4/7] spi: spi-qpic-snand: use the common qcom_nandc_config_cw_write() function

From: Gabor Juhos

Date: Mon Nov 09 2026 - 14:42:47 EST


The common function from the 'qpic_common' module provides the same
functionality as the locally implemented counterpart.

Use the common function and remove the local one in order to reduce
code duplication.

No functional changes intended.

Signed-off-by: Gabor Juhos <j4g8y7@xxxxxxxxx>
---
drivers/spi/spi-qpic-snand.c | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/drivers/spi/spi-qpic-snand.c b/drivers/spi/spi-qpic-snand.c
index a825bdb93a8a..6774a0a5db2a 100644
--- a/drivers/spi/spi-qpic-snand.c
+++ b/drivers/spi/spi-qpic-snand.c
@@ -1063,17 +1063,6 @@ static int qcom_spi_read_page(struct qcom_nand_controller *snandc,
return 0;
}

-static void qcom_spi_config_cw_write(struct qcom_nand_controller *snandc)
-{
- qcom_write_reg_dma(snandc, &snandc->regs->cmd, NAND_FLASH_CMD, 1, NAND_BAM_NEXT_SGL);
- qcom_write_reg_dma(snandc, &snandc->regs->exec, NAND_EXEC_CMD, 1, NAND_BAM_NEXT_SGL);
- qcom_read_reg_dma(snandc, NAND_FLASH_STATUS, 1, NAND_BAM_NEXT_SGL);
-
- qcom_write_reg_dma(snandc, &snandc->regs->clrflashstatus, NAND_FLASH_STATUS, 1, 0);
- qcom_write_reg_dma(snandc, &snandc->regs->clrreadstatus, NAND_READ_STATUS, 1,
- NAND_BAM_NEXT_SGL);
-}
-
static int qcom_spi_program_raw(struct qcom_nand_controller *snandc,
const struct spi_mem_op *op)
{
@@ -1144,7 +1133,7 @@ static int qcom_spi_program_raw(struct qcom_nand_controller *snandc,
qcom_write_data_dma(snandc, reg_off, oob_buf, oob_size2, 0);
oob_buf += oob_size2;

- qcom_spi_config_cw_write(snandc);
+ qcom_nandc_config_cw_write(snandc);
}

ret = qcom_submit_descs(snandc);
@@ -1214,7 +1203,7 @@ static int qcom_spi_program_ecc(struct qcom_nand_controller *snandc,
}
}

- qcom_spi_config_cw_write(snandc);
+ qcom_nandc_config_cw_write(snandc);

if (data_buf)
data_buf += data_size;
@@ -1271,7 +1260,7 @@ static int qcom_spi_program_oob(struct qcom_nand_controller *snandc,
oob_buf, 0, snandc->qspi->mtd->oobavail);
qcom_nandc_config_page_write(snandc);
qcom_write_data_dma(snandc, FLASH_BUF_ACC, snandc->data_buffer, data_size + oob_size, 0);
- qcom_spi_config_cw_write(snandc);
+ qcom_nandc_config_cw_write(snandc);

ret = qcom_submit_descs(snandc);
if (ret) {

--
2.56.0