mirror of
https://github.com/torvalds/linux
synced 2024-10-23 11:46:42 +00:00
[media] v4l: omap4iss: Replace udelay/msleep with usleep_range
The only udelay() call takes place in a sleepable context, we can sleep instead. Use usleep_range(). Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
57da5e47cc
commit
ca6f19b1cf
|
@ -642,11 +642,11 @@ static int iss_reset(struct iss_device *iss)
|
||||||
|
|
||||||
while (readl(iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_SYSCONFIG) &
|
while (readl(iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_SYSCONFIG) &
|
||||||
ISS_HL_SYSCONFIG_SOFTRESET) {
|
ISS_HL_SYSCONFIG_SOFTRESET) {
|
||||||
if (timeout++ > 10000) {
|
if (timeout++ > 100) {
|
||||||
dev_alert(iss->dev, "cannot reset ISS\n");
|
dev_alert(iss->dev, "cannot reset ISS\n");
|
||||||
return -ETIMEDOUT;
|
return -ETIMEDOUT;
|
||||||
}
|
}
|
||||||
udelay(1);
|
usleep_range(10, 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -674,7 +674,7 @@ static int iss_isp_reset(struct iss_device *iss)
|
||||||
dev_alert(iss->dev, "cannot set ISP5 to standby\n");
|
dev_alert(iss->dev, "cannot set ISP5 to standby\n");
|
||||||
return -ETIMEDOUT;
|
return -ETIMEDOUT;
|
||||||
}
|
}
|
||||||
msleep(1);
|
usleep_range(1000, 1500);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Now finally, do the reset */
|
/* Now finally, do the reset */
|
||||||
|
@ -689,7 +689,7 @@ static int iss_isp_reset(struct iss_device *iss)
|
||||||
dev_alert(iss->dev, "cannot reset ISP5\n");
|
dev_alert(iss->dev, "cannot reset ISP5\n");
|
||||||
return -ETIMEDOUT;
|
return -ETIMEDOUT;
|
||||||
}
|
}
|
||||||
msleep(1);
|
usleep_range(1000, 1500);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue