Path: csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod From: John Keeping Newsgroups: linux.kernel Subject: [PATCH v4 18/23] drm/rockchip: dw-mipi-dsi: use specific poll helper Date: Fri, 24 Feb 2017 14:00:02 +0100 Message-ID: References: X-Original-To: Mark Yao Dkim-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=metanate.com; s=stronger; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=sjL2Q2XXHX398F6YSAZ6k7rDL0Oq2ep4O253wtF8kl4=; b=rCs+N2Zd3HSCOXhsBdmGhWXeZH6Jp4CmlWn2sIyDNd2ku5mwdpTGKxZjTAaAHLPEEeZ83llankQ3PsgWtrCbGHb2I9QGrKV/0bIItCxQFFNK01r8rdcvBqsegZn+0YHpIE+xZvUOplPK6+vJDILaMzZ3hjEuuVmcOZJezXRHOKhiLJ5k8anFvMPXDs8OTwb7oqEMf3xbVwq3oKmytrtrz0c3BlrQpscbbdX1MJjOgNZEcJyWyAwXsgXmpA5cd1qCJb4Qa2sQTyxMVyj+JPXvDO6mEJsU7jJUO5sE+azy3lxl1Pf2DmEF/SC7ybDQtkYWKZXSV7h+BIqYGfCSJ2+jvA==; X-Mailer: git-send-email 2.12.0.rc0.230.gf625d4cdb9.dirty Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 67 Organization: linux.* mail to news gateway X-Original-Cc: Chris Zhong , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Sean Paul , John Keeping X-Original-Date: Fri, 24 Feb 2017 12:55:01 +0000 X-Original-Message-ID: <20170224125506.21533-19-john@metanate.com> X-Original-References: <20170224125506.21533-1-john@metanate.com> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1587575 As the documentation for readx_poll_timeout says, we want to use the specialized macro for readl rather than using the generic version directly. Signed-off-by: John Keeping Reviewed-by: Chris Zhong Reviewed-by: Sean Paul --- v4: - Add Sean's Reviewed-by v3: - Add Chris' Reviewed-by Unchanged in v2 --- drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c index e6b52c7cb5e3..ccf818d5c7ac 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c @@ -470,14 +470,14 @@ static int dw_mipi_dsi_phy_init(struct dw_mipi_dsi *dsi) PHY_UNRSTZ | PHY_UNSHUTDOWNZ); - ret = readx_poll_timeout(readl, dsi->base + DSI_PHY_STATUS, + ret = readl_poll_timeout(dsi->base + DSI_PHY_STATUS, val, val & LOCK, 1000, PHY_STATUS_TIMEOUT_US); if (ret < 0) { dev_err(dsi->dev, "failed to wait for phy lock state\n"); return ret; } - ret = readx_poll_timeout(readl, dsi->base + DSI_PHY_STATUS, + ret = readl_poll_timeout(dsi->base + DSI_PHY_STATUS, val, val & STOP_STATE_CLK_LANE, 1000, PHY_STATUS_TIMEOUT_US); if (ret < 0) { @@ -604,7 +604,7 @@ static int dw_mipi_dsi_gen_pkt_hdr_write(struct dw_mipi_dsi *dsi, u32 hdr_val) int ret; u32 val, mask; - ret = readx_poll_timeout(readl, dsi->base + DSI_CMD_PKT_STATUS, + ret = readl_poll_timeout(dsi->base + DSI_CMD_PKT_STATUS, val, !(val & GEN_CMD_FULL), 1000, CMD_PKT_STATUS_TIMEOUT_US); if (ret < 0) { @@ -615,7 +615,7 @@ static int dw_mipi_dsi_gen_pkt_hdr_write(struct dw_mipi_dsi *dsi, u32 hdr_val) dsi_write(dsi, DSI_GEN_HDR, hdr_val); mask = GEN_CMD_EMPTY | GEN_PLD_W_EMPTY; - ret = readx_poll_timeout(readl, dsi->base + DSI_CMD_PKT_STATUS, + ret = readl_poll_timeout(dsi->base + DSI_CMD_PKT_STATUS, val, (val & mask) == mask, 1000, CMD_PKT_STATUS_TIMEOUT_US); if (ret < 0) { @@ -676,7 +676,7 @@ static int dw_mipi_dsi_dcs_long_write(struct dw_mipi_dsi *dsi, len -= pld_data_bytes; } - ret = readx_poll_timeout(readl, dsi->base + DSI_CMD_PKT_STATUS, + ret = readl_poll_timeout(dsi->base + DSI_CMD_PKT_STATUS, val, !(val & GEN_PLD_W_FULL), 1000, CMD_PKT_STATUS_TIMEOUT_US); if (ret < 0) { -- 2.12.0.rc0.230.gf625d4cdb9.dirty