Skip to content

Commit 71ef4e6

Browse files
avri-altman-sndkmartinkpetersen
authored andcommitted
scsi: ufs: core: Do not open code read_poll_timeout
ufshcd_wait_for_register() practically does just that - replace with read_poll_timeout. Signed-off-by: Avri Altman <avri.altman@wdc.com> Link: https://lore.kernel.org/r/20240919112442.48491-1-avri.altman@wdc.com Reviewed-by: Bart Van Assche <bvanassche@acm.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 09822c2 commit 71ef4e6

1 file changed

Lines changed: 6 additions & 16 deletions

File tree

drivers/ufs/core/ufshcd.c

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -739,25 +739,15 @@ EXPORT_SYMBOL_GPL(ufshcd_delay_us);
739739
* Return: -ETIMEDOUT on error, zero on success.
740740
*/
741741
static int ufshcd_wait_for_register(struct ufs_hba *hba, u32 reg, u32 mask,
742-
u32 val, unsigned long interval_us,
743-
unsigned long timeout_ms)
742+
u32 val, unsigned long interval_us,
743+
unsigned long timeout_ms)
744744
{
745-
int err = 0;
746-
unsigned long timeout = jiffies + msecs_to_jiffies(timeout_ms);
747-
748-
/* ignore bits that we don't intend to wait on */
749-
val = val & mask;
745+
u32 v;
750746

751-
while ((ufshcd_readl(hba, reg) & mask) != val) {
752-
usleep_range(interval_us, interval_us + 50);
753-
if (time_after(jiffies, timeout)) {
754-
if ((ufshcd_readl(hba, reg) & mask) != val)
755-
err = -ETIMEDOUT;
756-
break;
757-
}
758-
}
747+
val &= mask; /* ignore bits that we don't intend to wait on */
759748

760-
return err;
749+
return read_poll_timeout(ufshcd_readl, v, (v & mask) == val,
750+
interval_us, timeout_ms * 1000, false, hba, reg);
761751
}
762752

763753
/**

0 commit comments

Comments
 (0)