]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
spi: spi-bcm-qspi: replace 'delay_usecs' with 'delay.value' check
authorAlexandru Ardelean <aardelean@deviqon.com>
Mon, 8 Mar 2021 14:54:55 +0000 (16:54 +0200)
committerMark Brown <broonie@kernel.org>
Fri, 12 Mar 2021 14:30:44 +0000 (14:30 +0000)
The 'delay_usecs' field is going away. The replacement for it is the
'delay' field. So, we should check for 'delay.value' being non-zero.

Signed-off-by: Alexandru Ardelean <aardelean@deviqon.com>
Link: https://lore.kernel.org/r/20210308145502.1075689-4-aardelean@deviqon.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-bcm-qspi.c

index 707fe3a5d8effcd04cbc54d1c82d7eb5dd3ba804..a78e56f566dd8933169fa6615bc3d6cb61a33305 100644 (file)
@@ -671,7 +671,7 @@ static int update_qspi_trans_byte_count(struct bcm_qspi *qspi,
        if (qt->byte >= qt->trans->len) {
                /* we're at the end of the spi_transfer */
                /* in TX mode, need to pause for a delay or CS change */
-               if (qt->trans->delay_usecs &&
+               if (qt->trans->delay.value &&
                    (flags & TRANS_STATUS_BREAK_DELAY))
                        ret |= TRANS_STATUS_BREAK_DELAY;
                if (qt->trans->cs_change &&