On 11/06/2024 17:50, Jonas Karlman wrote:
With CEC phys addr invalidation moved away from the irq handler there is
no longer a need for cec_notifier_mutex, remove it.

Signed-off-by: Jonas Karlman <jo...@kwiboo.se>
---
  drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 11 +----------
  1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c 
b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index 0814ca181f04..256e00a97a9a 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -189,7 +189,6 @@ struct dw_hdmi {
        void (*enable_audio)(struct dw_hdmi *hdmi);
        void (*disable_audio)(struct dw_hdmi *hdmi);
- struct mutex cec_notifier_mutex;
        struct cec_notifier *cec_notifier;
hdmi_codec_plugged_cb plugged_cb;
@@ -2459,11 +2458,8 @@ dw_hdmi_connector_detect(struct drm_connector 
*connector, bool force)
status = dw_hdmi_detect(hdmi); - if (status == connector_status_disconnected) {
-               mutex_lock(&hdmi->cec_notifier_mutex);
+       if (status == connector_status_disconnected)
                cec_notifier_phys_addr_invalidate(hdmi->cec_notifier);
-               mutex_unlock(&hdmi->cec_notifier_mutex);
-       }
return status;
  }
@@ -2577,9 +2573,7 @@ static int dw_hdmi_connector_create(struct dw_hdmi *hdmi)
        if (!notifier)
                return -ENOMEM;
- mutex_lock(&hdmi->cec_notifier_mutex);
        hdmi->cec_notifier = notifier;
-       mutex_unlock(&hdmi->cec_notifier_mutex);
return 0;
  }
@@ -2877,10 +2871,8 @@ static void dw_hdmi_bridge_detach(struct drm_bridge 
*bridge)
  {
        struct dw_hdmi *hdmi = bridge->driver_private;
- mutex_lock(&hdmi->cec_notifier_mutex);
        cec_notifier_conn_unregister(hdmi->cec_notifier);
        hdmi->cec_notifier = NULL;
-       mutex_unlock(&hdmi->cec_notifier_mutex);
  }
static enum drm_mode_status
@@ -3303,7 +3295,6 @@ struct dw_hdmi *dw_hdmi_probe(struct platform_device 
*pdev,
mutex_init(&hdmi->mutex);
        mutex_init(&hdmi->audio_mutex);
-       mutex_init(&hdmi->cec_notifier_mutex);
        spin_lock_init(&hdmi->audio_lock);
ret = dw_hdmi_parse_dt(hdmi);

Reviewed-by: Neil Armstrong <neil.armstr...@linaro.org>

Reply via email to