| Message ID | 20240821105943.230281-3-ada@thorsis.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Microchip OTPC driver on SAM9X60 exposing UIDxR as additional nvmem device | expand |
On 21.08.2024 13:59, Alexander Dahl wrote: > Makes no sense to have a timeout shorter than the sleep time, it would > run into timeout right after the first sleep already. > While at it, use a more specific macro instead of the generic one, which > does exactly the same, but needs less parameters. > > Signed-off-by: Alexander Dahl <ada@thorsis.com> Please add a Fixes tag. > --- > drivers/nvmem/microchip-otpc.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/nvmem/microchip-otpc.c b/drivers/nvmem/microchip-otpc.c > index 03e60b99f2c9..bd3383eabdf6 100644 > --- a/drivers/nvmem/microchip-otpc.c > +++ b/drivers/nvmem/microchip-otpc.c > @@ -87,8 +87,8 @@ static int mchp_otpc_prepare_read(struct mchp_otpc *otpc, > writel_relaxed(tmp, otpc->base + MCHP_OTPC_CR); > > /* Wait for packet to be transferred into temporary buffers. */ > - return read_poll_timeout(readl_relaxed, tmp, !(tmp & MCHP_OTPC_SR_READ), > - 10000, 2000, false, otpc->base + MCHP_OTPC_SR); > + return readl_relaxed_poll_timeout(otpc->base + MCHP_OTPC_SR, tmp, > + !(tmp & MCHP_OTPC_SR_READ), 2000, 10000); > } > > /*
diff --git a/drivers/nvmem/microchip-otpc.c b/drivers/nvmem/microchip-otpc.c index 03e60b99f2c9..bd3383eabdf6 100644 --- a/drivers/nvmem/microchip-otpc.c +++ b/drivers/nvmem/microchip-otpc.c @@ -87,8 +87,8 @@ static int mchp_otpc_prepare_read(struct mchp_otpc *otpc, writel_relaxed(tmp, otpc->base + MCHP_OTPC_CR); /* Wait for packet to be transferred into temporary buffers. */ - return read_poll_timeout(readl_relaxed, tmp, !(tmp & MCHP_OTPC_SR_READ), - 10000, 2000, false, otpc->base + MCHP_OTPC_SR); + return readl_relaxed_poll_timeout(otpc->base + MCHP_OTPC_SR, tmp, + !(tmp & MCHP_OTPC_SR_READ), 2000, 10000); } /*
Makes no sense to have a timeout shorter than the sleep time, it would run into timeout right after the first sleep already. While at it, use a more specific macro instead of the generic one, which does exactly the same, but needs less parameters. Signed-off-by: Alexander Dahl <ada@thorsis.com> --- drivers/nvmem/microchip-otpc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)