From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: "Andrzej Hajda" <andrzej.hajda@intel.com>,
"Neil Armstrong" <neil.armstrong@linaro.org>,
"Robert Foss" <rfoss@kernel.org>,
"David Airlie" <airlied@gmail.com>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"Jani Nikula" <jani.nikula@intel.com>,
"Sam Ravnborg" <sam@ravnborg.org>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Javier Martinez Canillas" <javierm@redhat.com>,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
"Tetsuo Handa" <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: kernel@pengutronix.de, dri-devel@lists.freedesktop.org,
Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Jonas Karlman <jonas@kwiboo.se>
Subject: [PATCH 01/19] drm/bridge: cdns-mhdp8546: Improve error reporting in remove callback
Date: Sat, 18 Mar 2023 20:07:46 +0100 [thread overview]
Message-ID: <20230318190804.234610-2-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <20230318190804.234610-1-u.kleine-koenig@pengutronix.de>
Replace the generic error message issued by the driver core when the remove
callback returns non-zero ("remove callback returned a non-zero value. This
will be ignored.") by a message that tells the actual problem.
Also simplify a bit by checking the return value of wait_event_timeout a
bit later.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
.../drm/bridge/cadence/cdns-mhdp8546-core.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
index f6822dfa3805..d74c6fa30ccc 100644
--- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
+++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
@@ -2574,7 +2574,6 @@ static int cdns_mhdp_remove(struct platform_device *pdev)
{
struct cdns_mhdp_device *mhdp = platform_get_drvdata(pdev);
unsigned long timeout = msecs_to_jiffies(100);
- bool stop_fw = false;
int ret;
drm_bridge_remove(&mhdp->bridge);
@@ -2582,18 +2581,19 @@ static int cdns_mhdp_remove(struct platform_device *pdev)
ret = wait_event_timeout(mhdp->fw_load_wq,
mhdp->hw_state == MHDP_HW_READY,
timeout);
- if (ret == 0)
- dev_err(mhdp->dev, "%s: Timeout waiting for fw loading\n",
- __func__);
- else
- stop_fw = true;
-
spin_lock(&mhdp->start_lock);
mhdp->hw_state = MHDP_HW_STOPPED;
spin_unlock(&mhdp->start_lock);
- if (stop_fw)
+ if (ret == 0) {
+ dev_err(mhdp->dev, "%s: Timeout waiting for fw loading\n",
+ __func__);
+ } else {
ret = cdns_mhdp_set_firmware_active(mhdp, false);
+ if (ret)
+ dev_err(mhdp->dev, "Failed to stop firmware (%pe)\n",
+ ERR_PTR(ret));
+ }
phy_exit(mhdp->phy);
@@ -2609,7 +2609,7 @@ static int cdns_mhdp_remove(struct platform_device *pdev)
clk_disable_unprepare(mhdp->clk);
- return ret;
+ return 0;
}
static const struct of_device_id mhdp_ids[] = {
--
2.39.2
next prev parent reply other threads:[~2023-03-18 19:09 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-18 19:07 [PATCH 00/19] drm/bridge: Convert to platform remove callback returning void Uwe Kleine-König
2023-03-18 19:07 ` Uwe Kleine-König [this message]
2023-03-19 13:13 ` [PATCH 01/19] drm/bridge: cdns-mhdp8546: Improve error reporting in remove callback Laurent Pinchart
2023-03-19 13:59 ` Uwe Kleine-König
2023-03-19 17:41 ` Laurent Pinchart
2023-03-18 19:07 ` [PATCH 02/19] drm/bridge: cdns-dsi: Convert to platform remove callback returning void Uwe Kleine-König
2023-03-18 19:07 ` [PATCH 03/19] drm/bridge: cdns-mhdp8546: " Uwe Kleine-König
2023-03-18 19:07 ` [PATCH 04/19] drm/bridge: display-connector: " Uwe Kleine-König
2023-03-18 19:07 ` [PATCH 05/19] drm/bridge: fsl-ldb: " Uwe Kleine-König
2023-03-18 19:07 ` [PATCH 06/19] drm/bridge: imx8qm-ldb: " Uwe Kleine-König
2023-03-18 19:07 ` [PATCH 07/19] drm/bridge: imx8qxp-ldb: " Uwe Kleine-König
2023-03-18 19:07 ` [PATCH 08/19] drm/bridge: imx8qxp-pixel-combiner: " Uwe Kleine-König
2023-03-18 19:07 ` [PATCH 09/19] drm/bridge: imx8qxp-pixel-link: " Uwe Kleine-König
2023-03-18 19:07 ` [PATCH 10/19] drm/bridge: imx8qxp-pxl2dpi: " Uwe Kleine-König
2023-03-18 19:07 ` [PATCH 11/19] drm/bridge: lvds-codec: " Uwe Kleine-König
2023-03-18 19:07 ` [PATCH 12/19] drm/bridge: nwl-dsi: " Uwe Kleine-König
2023-03-18 19:07 ` [PATCH 13/19] drm/bridge: simple-bridg: " Uwe Kleine-König
2023-03-18 19:07 ` [PATCH 14/19] drm/bridge: dw-hdmi-ahb-audio: " Uwe Kleine-König
2023-03-18 19:08 ` [PATCH 15/19] drm/bridge: dw-hdmi-cec: " Uwe Kleine-König
2023-03-18 19:08 ` [PATCH 16/19] drm/bridge: dw-hdmi-gp-audio: " Uwe Kleine-König
2023-03-18 19:08 ` [PATCH 17/19] drm/bridge: dw-hdmi-i2s-audio: " Uwe Kleine-König
2023-03-18 19:08 ` [PATCH 18/19] drm/bridge: thc63lvd1024: " Uwe Kleine-König
2023-03-18 19:08 ` [PATCH 19/19] drm/bridge: ti-tfp410: " Uwe Kleine-König
2023-03-19 13:14 ` [PATCH 00/19] drm/bridge: " Laurent Pinchart
2023-03-20 10:54 ` (subset) " Neil Armstrong
2023-05-09 6:07 ` Uwe Kleine-König
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=20230318190804.234610-2-u.kleine-koenig@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=airlied@gmail.com \
--cc=alexander.deucher@amd.com \
--cc=andrzej.hajda@intel.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=javierm@redhat.com \
--cc=jernej.skrabec@gmail.com \
--cc=jonas@kwiboo.se \
--cc=kernel@pengutronix.de \
--cc=neil.armstrong@linaro.org \
--cc=penguin-kernel@I-love.SAKURA.ne.jp \
--cc=rfoss@kernel.org \
--cc=sam@ravnborg.org \
--cc=tzimmermann@suse.de \
--cc=ville.syrjala@linux.intel.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).