[PATCH 5/5] spi: ma35d1-qspi: Use the existing update helper
Miquel Raynal <[email protected]>
| Newsgroups | org.kernel.vger.linux-spi,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <20260813-perso-ma35d1-upstream-qspi-v1-5-b217b9870eb1@bootlin.com> |
Read modify writes are already covered by a local helper, so use it. No functional change. Signed-off-by: Miquel Raynal <[email protected]> --- drivers/spi/spi-ma35d1-qspi.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/spi/spi-ma35d1-qspi.c b/drivers/spi/spi-ma35d1-qspi.c index 9965a11573d8..7f938d0c6f1f 100644 --- a/drivers/spi/spi-ma35d1-qspi.c +++ b/drivers/spi/spi-ma35d1-qspi.c @@ -115,10 +115,11 @@ static int nuvoton_qspi_reset_fifo(struct nuvoton_qspi *qspi) { u32 val; - val = nuvoton_qspi_read(qspi, NUVOTON_QSPI_FIFOCTL_OFFSET); - val |= NUVOTON_QSPI_FIFOCTL_TXRST_MASK | - NUVOTON_QSPI_FIFOCTL_RXRST_MASK; - nuvoton_qspi_write(qspi, val, NUVOTON_QSPI_FIFOCTL_OFFSET); + nuvoton_qspi_update_bits(qspi, NUVOTON_QSPI_FIFOCTL_OFFSET, + NUVOTON_QSPI_FIFOCTL_TXRST_MASK | + NUVOTON_QSPI_FIFOCTL_RXRST_MASK, + NUVOTON_QSPI_FIFOCTL_TXRST_MASK | + NUVOTON_QSPI_FIFOCTL_RXRST_MASK); /* * Give the controller a short time to latch the FIFO reset request @@ -356,9 +357,9 @@ static int nuvoton_qspi_hw_init(struct nuvoton_qspi *qspi) NUVOTON_QSPI_CTL_LSB_MASK, NUVOTON_QSPI_CTL_TXNEG_MASK); - val = nuvoton_qspi_read(qspi, NUVOTON_QSPI_CTL_OFFSET); - nuvoton_qspi_write(qspi, val | NUVOTON_QSPI_CTL_SPIEN_MASK, - NUVOTON_QSPI_CTL_OFFSET); + nuvoton_qspi_update_bits(qspi, NUVOTON_QSPI_CTL_OFFSET, + NUVOTON_QSPI_CTL_SPIEN_MASK, + NUVOTON_QSPI_CTL_SPIEN_MASK); ret = readl_poll_timeout(qspi->regs + NUVOTON_QSPI_STATUS_OFFSET, val, (val & NUVOTON_QSPI_STATUS_SPIENSTS_MASK), -- 2.54.0