[PATCH 06/19] drm/msm/dp: Replace ST_DISCONNECTED with checks for connected

[Jessica Zhang]

Replace ST_DISCONNECTED checks with checks for if !msm_dp::connected as
they both represent the DP cable being disconnected

Signed-off-by: Jessica Zhang <jessica.zh...@oss.qualcomm.com>
---
 drivers/gpu/drm/msm/dp/dp_display.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/msm/dp/dp_display.c 
b/drivers/gpu/drm/msm/dp/dp_display.c
index af3cc32aa123..0f1c1fd2b1b7 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -521,12 +521,12 @@ static int 
msm_dp_display_handle_port_status_changed(struct msm_dp_display_priva
 
        if (drm_dp_is_branch(dp->panel->dpcd) && dp->link->sink_count == 0) {
                drm_dbg_dp(dp->drm_dev, "sink count is zero, nothing to do\n");
-               if (dp->hpd_state != ST_DISCONNECTED) {
+               if (dp->msm_dp_display.connected) {
                        dp->hpd_state = ST_DISCONNECT_PENDING;
                        msm_dp_add_event(dp, EV_USER_NOTIFICATION, false, 0);
                }
        } else {
-               if (dp->hpd_state == ST_DISCONNECTED) {
+               if (!dp->msm_dp_display.connected) {
                        dp->hpd_state = ST_MAINLINK_READY;
                        rc = msm_dp_display_process_hpd_high(dp);
                        if (rc)
@@ -543,7 +543,7 @@ static int msm_dp_display_handle_irq_hpd(struct 
msm_dp_display_private *dp)
        u32 sink_request = dp->link->sink_request;
 
        drm_dbg_dp(dp->drm_dev, "%d\n", sink_request);
-       if (dp->hpd_state == ST_DISCONNECTED) {
+       if (!dp->msm_dp_display.connected) {
                if (sink_request & DP_LINK_STATUS_UPDATED) {
                        drm_dbg_dp(dp->drm_dev, "Disconnected sink_request: 
%d\n",
                                                        sink_request);
@@ -666,7 +666,7 @@ static int msm_dp_hpd_unplug_handle(struct 
msm_dp_display_private *dp, u32 data)
        /* unplugged, no more irq_hpd handle */
        msm_dp_del_event(dp, EV_IRQ_HPD_INT);
 
-       if (state == ST_DISCONNECTED) {
+       if (!dp->msm_dp_display.connected) {
                /* triggered by irq_hdp with sink_count = 0 */
                if (dp->link->sink_count == 0) {
                        msm_dp_display_host_phy_exit(dp);

-- 
2.50.1