From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>,
Andrzej Hajda <a.hajda@samsung.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
Tomi Valkeinen <tomi.valkeinen@ti.com>,
Andrey Gusakov <andrey.gusakov@cogentembedded.com>,
Philipp Zabel <p.zabel@pengutronix.de>,
Cory Tusar <cory.tusar@zii.aero>, Chris Healy <cphealy@gmail.com>,
Lucas Stach <l.stach@pengutronix.de>,
linux-kernel@vger.kernel.org
Subject: [PATCH v4 01/15] drm/bridge: tc358767: Simplify tc_poll_timeout()
Date: Thu, 6 Jun 2019 21:45:36 -0700 [thread overview]
Message-ID: <20190607044550.13361-2-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190607044550.13361-1-andrew.smirnov@gmail.com>
Implementation of tc_poll_timeout() is almost a 100% copy-and-paste of
the code for regmap_read_poll_timeout(). Replace copied code with a
call to the original. While at it change tc_poll_timeout to accept
"struct tc_data *" instead of "struct regmap *" for brevity. No
functional change intended.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Andrzej Hajda <a.hajda@samsung.com>
Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Andrey Gusakov <andrey.gusakov@cogentembedded.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Cory Tusar <cory.tusar@zii.aero>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org
---
drivers/gpu/drm/bridge/tc358767.c | 26 ++++++--------------------
1 file changed, 6 insertions(+), 20 deletions(-)
diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c
index 58e3ca0e25af..fb8a1942ec54 100644
--- a/drivers/gpu/drm/bridge/tc358767.c
+++ b/drivers/gpu/drm/bridge/tc358767.c
@@ -264,34 +264,21 @@ static inline struct tc_data *connector_to_tc(struct drm_connector *c)
goto err; \
} while (0)
-static inline int tc_poll_timeout(struct regmap *map, unsigned int addr,
+static inline int tc_poll_timeout(struct tc_data *tc, unsigned int addr,
unsigned int cond_mask,
unsigned int cond_value,
unsigned long sleep_us, u64 timeout_us)
{
- ktime_t timeout = ktime_add_us(ktime_get(), timeout_us);
unsigned int val;
- int ret;
- for (;;) {
- ret = regmap_read(map, addr, &val);
- if (ret)
- break;
- if ((val & cond_mask) == cond_value)
- break;
- if (timeout_us && ktime_compare(ktime_get(), timeout) > 0) {
- ret = regmap_read(map, addr, &val);
- break;
- }
- if (sleep_us)
- usleep_range((sleep_us >> 2) + 1, sleep_us);
- }
- return ret ?: (((val & cond_mask) == cond_value) ? 0 : -ETIMEDOUT);
+ return regmap_read_poll_timeout(tc->regmap, addr, val,
+ (val & cond_mask) == cond_value,
+ sleep_us, timeout_us);
}
static int tc_aux_wait_busy(struct tc_data *tc, unsigned int timeout_ms)
{
- return tc_poll_timeout(tc->regmap, DP0_AUXSTATUS, AUX_BUSY, 0,
+ return tc_poll_timeout(tc, DP0_AUXSTATUS, AUX_BUSY, 0,
1000, 1000 * timeout_ms);
}
@@ -598,8 +585,7 @@ static int tc_aux_link_setup(struct tc_data *tc)
tc_write(DP1_PLLCTRL, PLLUPDATE | PLLEN);
tc_wait_pll_lock(tc);
- ret = tc_poll_timeout(tc->regmap, DP_PHY_CTRL, PHY_RDY, PHY_RDY, 1,
- 1000);
+ ret = tc_poll_timeout(tc, DP_PHY_CTRL, PHY_RDY, PHY_RDY, 1, 1000);
if (ret == -ETIMEDOUT) {
dev_err(tc->dev, "Timeout waiting for PHY to become ready");
return ret;
--
2.21.0
next prev parent reply other threads:[~2019-06-07 4:46 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-07 4:45 [PATCH v4 00/15] tc358767 driver improvements Andrey Smirnov
2019-06-07 4:45 ` Andrey Smirnov [this message]
2019-06-07 4:45 ` [PATCH v4 02/15] drm/bridge: tc358767: Simplify polling in tc_main_link_setup() Andrey Smirnov
2019-06-07 4:45 ` [PATCH v4 03/15] drm/bridge: tc358767: Simplify polling in tc_link_training() Andrey Smirnov
2019-06-07 4:45 ` [PATCH v4 04/15] drm/bridge: tc358767: Simplify tc_set_video_mode() Andrey Smirnov
2019-06-07 4:45 ` [PATCH v4 05/15] drm/bridge: tc358767: Drop custom tc_write()/tc_read() accessors Andrey Smirnov
2019-06-07 4:45 ` [PATCH v4 06/15] drm/bridge: tc358767: Simplify AUX data read Andrey Smirnov
2019-06-07 4:45 ` [PATCH v4 07/15] drm/bridge: tc358767: Simplify AUX data write Andrey Smirnov
2019-06-07 4:45 ` [PATCH v4 08/15] drm/bridge: tc358767: Increase AUX transfer length limit Andrey Smirnov
2019-06-07 4:45 ` [PATCH v4 09/15] drm/bridge: tc358767: Use reported AUX transfer size Andrey Smirnov
2019-06-07 6:10 ` Andrzej Hajda
2019-06-07 4:45 ` [PATCH v4 10/15] drm/bridge: tc358767: Add support for address-only I2C transfers Andrey Smirnov
2019-06-07 6:13 ` Andrzej Hajda
2019-06-07 4:45 ` [PATCH v4 11/15] drm/bridge: tc358767: Introduce tc_set_syspllparam() Andrey Smirnov
2019-06-07 6:15 ` Andrzej Hajda
2019-06-07 4:45 ` [PATCH v4 12/15] drm/bridge: tc358767: Introduce tc_pllupdate_pllen() Andrey Smirnov
2019-06-07 6:20 ` Andrzej Hajda
2019-06-07 4:45 ` [PATCH v4 13/15] drm/bridge: tc358767: Simplify tc_aux_wait_busy() Andrey Smirnov
2019-06-07 6:21 ` Andrzej Hajda
2019-06-07 4:45 ` [PATCH v4 14/15] drm/bridge: tc358767: Drop unnecessary 8 byte buffer Andrey Smirnov
2019-06-07 6:41 ` Andrzej Hajda
2019-06-07 4:45 ` [PATCH v4 15/15] drm/bridge: tc358767: Replace magic number in tc_main_link_enable() Andrey Smirnov
2019-06-07 6:42 ` Andrzej Hajda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190607044550.13361-2-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=a.hajda@samsung.com \
--cc=andrey.gusakov@cogentembedded.com \
--cc=cory.tusar@zii.aero \
--cc=cphealy@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=l.stach@pengutronix.de \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=tomi.valkeinen@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).