drm/msm/dp: Drop now unused hpd_high member

[ Upstream commit fabae667b1263216be53e0230cd3966a9a1963a4 ]

Since '8ede2ecc3e5e ("drm/msm/dp: Add DP compliance tests on Snapdragon
Chipsets")' the hpd_high member of struct dp_usbpd has been write-only.

Let's clean up the code a little bit by removing the writes as well.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20211106172246.2597431-1-bjorn.andersson@linaro.org
Signed-off-by: Rob Clark <robdclark@chromium.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index 8b51a5c..a66ee63 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -547,11 +547,8 @@ static int dp_hpd_plug_handle(struct dp_display_private *dp, u32 data)
 
        dp->hpd_state = ST_CONNECT_PENDING;
 
-       hpd->hpd_high = 1;
-
        ret = dp_display_usbpd_configure_cb(&dp->pdev->dev);
        if (ret) {      /* link train failed */
-               hpd->hpd_high = 0;
                dp->hpd_state = ST_DISCONNECTED;
 
                if (ret == -ECONNRESET) { /* cable unplugged */
@@ -628,7 +625,6 @@ static int dp_hpd_unplug_handle(struct dp_display_private *dp, u32 data)
                /* triggered by irq_hdp with sink_count = 0 */
                if (dp->link->sink_count == 0) {
                        dp_ctrl_off_phy(dp->ctrl);
-                       hpd->hpd_high = 0;
                        dp->core_initialized = false;
                }
                mutex_unlock(&dp->event_mutex);
@@ -652,8 +648,6 @@ static int dp_hpd_unplug_handle(struct dp_display_private *dp, u32 data)
        /* disable HPD plug interrupts */
        dp_catalog_hpd_config_intr(dp->catalog, DP_DP_HPD_PLUG_INT_MASK, false);
 
-       hpd->hpd_high = 0;
-
        /*
         * We don't need separate work for disconnect as
         * connect/attention interrupts are disabled

diff --git a/drivers/gpu/drm/msm/dp/dp_hpd.c b/drivers/gpu/drm/msm/dp/dp_hpd.c
index e1c90fa..db98a1d 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_hpd.c
+++ b/drivers/gpu/drm/msm/dp/dp_hpd.c
@@ -32,8 +32,6 @@ int dp_hpd_connect(struct dp_usbpd *dp_usbpd, bool hpd)
        hpd_priv = container_of(dp_usbpd, struct dp_hpd_private,
                                        dp_usbpd);
 
-       dp_usbpd->hpd_high = hpd;
-
        if (!hpd_priv->dp_cb || !hpd_priv->dp_cb->configure
                                || !hpd_priv->dp_cb->disconnect) {
                pr_err("hpd dp_cb not initialized\n");

diff --git a/drivers/gpu/drm/msm/dp/dp_hpd.h b/drivers/gpu/drm/msm/dp/dp_hpd.h
index 5bc5bb6..8feec5a 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_hpd.h
+++ b/drivers/gpu/drm/msm/dp/dp_hpd.h
@@ -26,7 +26,6 @@ enum plug_orientation {
  * @multi_func: multi-function preferred
  * @usb_config_req: request to switch to usb
  * @exit_dp_mode: request exit from displayport mode
- * @hpd_high: Hot Plug Detect signal is high.
  * @hpd_irq: Change in the status since last message
  * @alt_mode_cfg_done: bool to specify alt mode status
  * @debug_en: bool to specify debug mode
@@ -39,7 +38,6 @@ struct dp_usbpd {
        bool multi_func;
        bool usb_config_req;
        bool exit_dp_mode;
-       bool hpd_high;
        bool hpd_irq;
        bool alt_mode_cfg_done;
        bool debug_en;