Commit 38af68cb authored by Chunfeng Yun's avatar Chunfeng Yun Committed by Vinod Koul
Browse files

phy: phy-qcom-apq8064-sata: convert to readl_relaxed_poll_timeout() 



Use readl_relaxed_poll_timeout() to simplify code, rename local function
read_poll_timeout() as poll_timeout() to avoid repeated definition

Signed-off-by: default avatarChunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/1598320987-25518-4-git-send-email-chunfeng.yun@mediatek.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 6f2a7218

drivers/phy/qualcomm/phy-qcom-apq8064-sata.c

+8 −13
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 */



#include <linux/io.h>

#include <linux/iopoll.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/of.h>
@@ -72,18 +73,12 @@ struct qcom_apq8064_sata_phy { 
};



/* Helper function to do poll and timeout */

static int read_poll_timeout(void __iomem *addr, u32 mask)

static int poll_timeout(void __iomem *addr, u32 mask)

{

	unsigned long timeout = jiffies + msecs_to_jiffies(TIMEOUT_MS);

	u32 val;



	do {

		if (readl_relaxed(addr) & mask)

			return 0;



		usleep_range(DELAY_INTERVAL_US, DELAY_INTERVAL_US + 50);

	} while (!time_after(jiffies, timeout));



	return (readl_relaxed(addr) & mask) ? 0 : -ETIMEDOUT;

	return readl_relaxed_poll_timeout(addr, val, (val & mask),

					DELAY_INTERVAL_US, TIMEOUT_MS * 1000);

}



static int qcom_apq8064_sata_phy_init(struct phy *generic_phy)
@@ -137,21 +132,21 @@ static int qcom_apq8064_sata_phy_init(struct phy *generic_phy) 
	writel_relaxed(0x05, base + UNIPHY_PLL_LKDET_CFG2);



	/* PLL Lock wait */

	ret = read_poll_timeout(base + UNIPHY_PLL_STATUS, UNIPHY_PLL_LOCK);

	ret = poll_timeout(base + UNIPHY_PLL_STATUS, UNIPHY_PLL_LOCK);

	if (ret) {

		dev_err(phy->dev, "poll timeout UNIPHY_PLL_STATUS\n");

		return ret;

	}



	/* TX Calibration */

	ret = read_poll_timeout(base + SATA_PHY_TX_IMCAL_STAT, SATA_PHY_TX_CAL);

	ret = poll_timeout(base + SATA_PHY_TX_IMCAL_STAT, SATA_PHY_TX_CAL);

	if (ret) {

		dev_err(phy->dev, "poll timeout SATA_PHY_TX_IMCAL_STAT\n");

		return ret;

	}



	/* RX Calibration */

	ret = read_poll_timeout(base + SATA_PHY_RX_IMCAL_STAT, SATA_PHY_RX_CAL);

	ret = poll_timeout(base + SATA_PHY_RX_IMCAL_STAT, SATA_PHY_RX_CAL);

	if (ret) {

		dev_err(phy->dev, "poll timeout SATA_PHY_RX_IMCAL_STAT\n");

		return ret;