On Fri 21 Dec 02:13 PST 2018, Marc Gonzalez wrote:
> The private copy of readl_poll_timeout is no longer needed.
> Use the implementation in iopoll.h instead.
>
> Signed-off-by: Marc Gonzalez <marc.w.gonzalez@xxxxxxx>
Reviewed-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
Regards,
Bjorn
> ---
> drivers/phy/qualcomm/phy-qcom-ufs-i.h | 19 +------------------
> 1 file changed, 1 insertion(+), 18 deletions(-)
>
> diff --git a/drivers/phy/qualcomm/phy-qcom-ufs-i.h b/drivers/phy/qualcomm/phy-qcom-ufs-i.h
> index 681644e43248..f798fb64de94 100644
> --- a/drivers/phy/qualcomm/phy-qcom-ufs-i.h
> +++ b/drivers/phy/qualcomm/phy-qcom-ufs-i.h
> @@ -23,24 +23,7 @@
> #include <linux/platform_device.h>
> #include <linux/io.h>
> #include <linux/delay.h>
> -
> -#define readl_poll_timeout(addr, val, cond, sleep_us, timeout_us) \
> -({ \
> - ktime_t timeout = ktime_add_us(ktime_get(), timeout_us); \
> - might_sleep_if(timeout_us); \
> - for (;;) { \
> - (val) = readl(addr); \
> - if (cond) \
> - break; \
> - if (timeout_us && ktime_compare(ktime_get(), timeout) > 0) { \
> - (val) = readl(addr); \
> - break; \
> - } \
> - if (sleep_us) \
> - usleep_range(DIV_ROUND_UP(sleep_us, 4), sleep_us); \
> - } \
> - (cond) ? 0 : -ETIMEDOUT; \
> -})
> +#include <linux/iopoll.h>
>
> #define UFS_QCOM_PHY_CAL_ENTRY(reg, val) \
> { \
> --
> 2.17.1
