Re: [PATCH] drm: bridge: rename the function drm_bridge_hpd_notify to drm_bridge_hpd_cb

2021-04-07 Thread Dafna Hirschfeld 

Hi

On 06.04.21 14:40, Laurent Pinchart wrote:

Hi Dafna,

Thank you for the patch.

On Tue, Mar 30, 2021 at 01:52:00PM +0200, Dafna Hirschfeld wrote:

drm_bridge_funcs has a function called 'hpd_notify'.
The function drm_bridge_hpd_notify does not call
'hpd_notify' but it calls 'hpd_cb'. This is rather
confusing. Rename the function to fix this confusion.

Signed-off-by: Dafna Hirschfeld 
---
  drivers/gpu/drm/bridge/adv7511/adv7511_drv.c| 2 +-
  drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 4 ++--
  drivers/gpu/drm/bridge/display-connector.c  | 2 +-
  drivers/gpu/drm/bridge/lontium-lt9611uxc.c  | 8 
  drivers/gpu/drm/bridge/synopsys/dw-hdmi.c   | 2 +-
  drivers/gpu/drm/bridge/ti-tpd12s015.c   | 2 +-
  drivers/gpu/drm/drm_bridge.c| 8 
  include/drm/drm_bridge.h| 8 
  8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c 
b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index 76555ae64e9c..748f82910f4f 100644
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -449,7 +449,7 @@ static void adv7511_hpd_work(struct work_struct *work)
cec_phys_addr_invalidate(adv7511->cec_adap);
drm_kms_helper_hotplug_event(adv7511->connector.dev);
} else {
-   drm_bridge_hpd_notify(>bridge, status);
+   drm_bridge_hpd_cb(>bridge, status);
}
}
  }
diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c 
b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
index d0c65610ebb5..682da288ff6d 100644
--- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
+++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
@@ -794,7 +794,7 @@ static void cdns_mhdp_fw_cb(const struct firmware *fw, void 
*context)
if (mhdp->connector.dev)
drm_kms_helper_hotplug_event(mhdp->bridge.dev);
else
-   drm_bridge_hpd_notify(>bridge, 
cdns_mhdp_detect(mhdp));
+   drm_bridge_hpd_cb(>bridge, 
cdns_mhdp_detect(mhdp));
}
  }
  
@@ -2314,7 +2314,7 @@ static irqreturn_t cdns_mhdp_irq_handler(int irq, void *data)

else
drm_kms_helper_hotplug_event(mhdp->bridge.dev);
} else {
-   drm_bridge_hpd_notify(>bridge, 
cdns_mhdp_detect(mhdp));
+   drm_bridge_hpd_cb(>bridge, 
cdns_mhdp_detect(mhdp));
}
}
  
diff --git a/drivers/gpu/drm/bridge/display-connector.c b/drivers/gpu/drm/bridge/display-connector.c

index 05eb759da6fc..8ccd69d7fe34 100644
--- a/drivers/gpu/drm/bridge/display-connector.c
+++ b/drivers/gpu/drm/bridge/display-connector.c
@@ -98,7 +98,7 @@ static irqreturn_t display_connector_hpd_irq(int irq, void 
*arg)
struct display_connector *conn = arg;
struct drm_bridge *bridge = >bridge;
  
-	drm_bridge_hpd_notify(bridge, display_connector_detect(bridge));

+   drm_bridge_hpd_cb(bridge, display_connector_detect(bridge));
  
  	return IRQ_HANDLED;

  }
diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c 
b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
index fee27952ec6d..58f61b5da605 100644
--- a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
+++ b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
@@ -175,10 +175,10 @@ static void lt9611uxc_hpd_work(struct work_struct *work)
connected = lt9611uxc->hdmi_connected;
mutex_unlock(>ocm_lock);
  
-		drm_bridge_hpd_notify(>bridge,

- connected ?
- connector_status_connected :
- connector_status_disconnected);
+   drm_bridge_hpd_cb(>bridge,
+ connected ?
+ connector_status_connected :
+ connector_status_disconnected);
}
  }
  
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c

index dda4fa9a1a08..984ab5c4bc71 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -3026,7 +3026,7 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id)
  
  		if (hdmi->bridge.dev) {

drm_helper_hpd_irq_event(hdmi->bridge.dev);
-   drm_bridge_hpd_notify(>bridge, status);
+   drm_bridge_hpd_cb(>bridge, status);
}
}
  
diff --git a/drivers/gpu/drm/bridge/ti-tpd12s015.c b/drivers/gpu/drm/bridge/ti-tpd12s015.c

index e0e015243a60..2f079b6f51bc 100644
--- a/drivers/gpu/drm/bridge/ti-tpd12s015.c
+++ b/drivers/gpu/drm/bridge/ti-tpd12s015.c
@@ -103,7 +103,7 @@ static irqreturn_t

Re: [PATCH] drm: bridge: rename the function drm_bridge_hpd_notify to drm_bridge_hpd_cb

2021-04-06 Thread Laurent Pinchart 
Hi Dafna,

Thank you for the patch.

On Tue, Mar 30, 2021 at 01:52:00PM +0200, Dafna Hirschfeld wrote:
> drm_bridge_funcs has a function called 'hpd_notify'.
> The function drm_bridge_hpd_notify does not call
> 'hpd_notify' but it calls 'hpd_cb'. This is rather
> confusing. Rename the function to fix this confusion.
> 
> Signed-off-by: Dafna Hirschfeld 
> ---
>  drivers/gpu/drm/bridge/adv7511/adv7511_drv.c| 2 +-
>  drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 4 ++--
>  drivers/gpu/drm/bridge/display-connector.c  | 2 +-
>  drivers/gpu/drm/bridge/lontium-lt9611uxc.c  | 8 
>  drivers/gpu/drm/bridge/synopsys/dw-hdmi.c   | 2 +-
>  drivers/gpu/drm/bridge/ti-tpd12s015.c   | 2 +-
>  drivers/gpu/drm/drm_bridge.c| 8 
>  include/drm/drm_bridge.h| 8 
>  8 files changed, 18 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c 
> b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> index 76555ae64e9c..748f82910f4f 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> @@ -449,7 +449,7 @@ static void adv7511_hpd_work(struct work_struct *work)
>   cec_phys_addr_invalidate(adv7511->cec_adap);
>   drm_kms_helper_hotplug_event(adv7511->connector.dev);
>   } else {
> - drm_bridge_hpd_notify(>bridge, status);
> + drm_bridge_hpd_cb(>bridge, status);
>   }
>   }
>  }
> diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c 
> b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
> index d0c65610ebb5..682da288ff6d 100644
> --- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
> +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
> @@ -794,7 +794,7 @@ static void cdns_mhdp_fw_cb(const struct firmware *fw, 
> void *context)
>   if (mhdp->connector.dev)
>   drm_kms_helper_hotplug_event(mhdp->bridge.dev);
>   else
> - drm_bridge_hpd_notify(>bridge, 
> cdns_mhdp_detect(mhdp));
> + drm_bridge_hpd_cb(>bridge, 
> cdns_mhdp_detect(mhdp));
>   }
>  }
>  
> @@ -2314,7 +2314,7 @@ static irqreturn_t cdns_mhdp_irq_handler(int irq, void 
> *data)
>   else
>   drm_kms_helper_hotplug_event(mhdp->bridge.dev);
>   } else {
> - drm_bridge_hpd_notify(>bridge, 
> cdns_mhdp_detect(mhdp));
> + drm_bridge_hpd_cb(>bridge, 
> cdns_mhdp_detect(mhdp));
>   }
>   }
>  
> diff --git a/drivers/gpu/drm/bridge/display-connector.c 
> b/drivers/gpu/drm/bridge/display-connector.c
> index 05eb759da6fc..8ccd69d7fe34 100644
> --- a/drivers/gpu/drm/bridge/display-connector.c
> +++ b/drivers/gpu/drm/bridge/display-connector.c
> @@ -98,7 +98,7 @@ static irqreturn_t display_connector_hpd_irq(int irq, void 
> *arg)
>   struct display_connector *conn = arg;
>   struct drm_bridge *bridge = >bridge;
>  
> - drm_bridge_hpd_notify(bridge, display_connector_detect(bridge));
> + drm_bridge_hpd_cb(bridge, display_connector_detect(bridge));
>  
>   return IRQ_HANDLED;
>  }
> diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c 
> b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
> index fee27952ec6d..58f61b5da605 100644
> --- a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
> +++ b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
> @@ -175,10 +175,10 @@ static void lt9611uxc_hpd_work(struct work_struct *work)
>   connected = lt9611uxc->hdmi_connected;
>   mutex_unlock(>ocm_lock);
>  
> - drm_bridge_hpd_notify(>bridge,
> -   connected ?
> -   connector_status_connected :
> -   connector_status_disconnected);
> + drm_bridge_hpd_cb(>bridge,
> +   connected ?
> +   connector_status_connected :
> +   connector_status_disconnected);
>   }
>  }
>  
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c 
> b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> index dda4fa9a1a08..984ab5c4bc71 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> @@ -3026,7 +3026,7 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id)
>  
>   if (hdmi->bridge.dev) {
>   drm_helper_hpd_irq_event(hdmi->bridge.dev);
> - drm_bridge_hpd_notify(>bridge, status);
> + drm_bridge_hpd_cb(>bridge, status);
>   }
>   }
>  
> diff --git a/drivers/gpu/drm/bridge/ti-tpd12s015.c 
> b/drivers/gpu/drm/bridge/ti-tpd12s015.c
> index e0e015243a60..2f079b6f51bc 100644
> ---

Re: [PATCH] drm: bridge: rename the function drm_bridge_hpd_notify to drm_bridge_hpd_cb

2021-04-06 Thread Robert Foss 
Reviewed-by: Robert Foss 

On Tue, 30 Mar 2021 at 14:28, Robert Foss  wrote:
>
> Hey Dafna,
>
> Thanks for submitting a cleanup patch, it is much appreciated. It
> looks good to me, feel free to add my r-b.
>
> I'm not going to merge this right away, but will let this patch soak
> for a while to let other people have a look at it.
>
> On Tue, 30 Mar 2021 at 13:52, Dafna Hirschfeld
>  wrote:
> >
> > drm_bridge_funcs has a function called 'hpd_notify'.
> > The function drm_bridge_hpd_notify does not call
> > 'hpd_notify' but it calls 'hpd_cb'. This is rather
> > confusing. Rename the function to fix this confusion.
> >
> > Signed-off-by: Dafna Hirschfeld 
> > ---
> >  drivers/gpu/drm/bridge/adv7511/adv7511_drv.c| 2 +-
> >  drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 4 ++--
> >  drivers/gpu/drm/bridge/display-connector.c  | 2 +-
> >  drivers/gpu/drm/bridge/lontium-lt9611uxc.c  | 8 
> >  drivers/gpu/drm/bridge/synopsys/dw-hdmi.c   | 2 +-
> >  drivers/gpu/drm/bridge/ti-tpd12s015.c   | 2 +-
> >  drivers/gpu/drm/drm_bridge.c| 8 
> >  include/drm/drm_bridge.h| 8 
> >  8 files changed, 18 insertions(+), 18 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c 
> > b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> > index 76555ae64e9c..748f82910f4f 100644
> > --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> > +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> > @@ -449,7 +449,7 @@ static void adv7511_hpd_work(struct work_struct *work)
> > cec_phys_addr_invalidate(adv7511->cec_adap);
> > 
> > drm_kms_helper_hotplug_event(adv7511->connector.dev);
> > } else {
> > -   drm_bridge_hpd_notify(>bridge, status);
> > +   drm_bridge_hpd_cb(>bridge, status);
> > }
> > }
> >  }
> > diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c 
> > b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
> > index d0c65610ebb5..682da288ff6d 100644
> > --- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
> > +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
> > @@ -794,7 +794,7 @@ static void cdns_mhdp_fw_cb(const struct firmware *fw, 
> > void *context)
> > if (mhdp->connector.dev)
> > drm_kms_helper_hotplug_event(mhdp->bridge.dev);
> > else
> > -   drm_bridge_hpd_notify(>bridge, 
> > cdns_mhdp_detect(mhdp));
> > +   drm_bridge_hpd_cb(>bridge, 
> > cdns_mhdp_detect(mhdp));
> > }
> >  }
> >
> > @@ -2314,7 +2314,7 @@ static irqreturn_t cdns_mhdp_irq_handler(int irq, 
> > void *data)
> > else
> > 
> > drm_kms_helper_hotplug_event(mhdp->bridge.dev);
> > } else {
> > -   drm_bridge_hpd_notify(>bridge, 
> > cdns_mhdp_detect(mhdp));
> > +   drm_bridge_hpd_cb(>bridge, 
> > cdns_mhdp_detect(mhdp));
> > }
> > }
> >
> > diff --git a/drivers/gpu/drm/bridge/display-connector.c 
> > b/drivers/gpu/drm/bridge/display-connector.c
> > index 05eb759da6fc..8ccd69d7fe34 100644
> > --- a/drivers/gpu/drm/bridge/display-connector.c
> > +++ b/drivers/gpu/drm/bridge/display-connector.c
> > @@ -98,7 +98,7 @@ static irqreturn_t display_connector_hpd_irq(int irq, 
> > void *arg)
> > struct display_connector *conn = arg;
> > struct drm_bridge *bridge = >bridge;
> >
> > -   drm_bridge_hpd_notify(bridge, display_connector_detect(bridge));
> > +   drm_bridge_hpd_cb(bridge, display_connector_detect(bridge));
> >
> > return IRQ_HANDLED;
> >  }
> > diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c 
> > b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
> > index fee27952ec6d..58f61b5da605 100644
> > --- a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
> > +++ b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
> > @@ -175,10 +175,10 @@ static void lt9611uxc_hpd_work(struct work_struct 
> > *work)
> > connected = lt9611uxc->hdmi_connected;
> > mutex_unlock(>ocm_lock);
> >
> > -   drm_bridge_hpd_notify(>bridge,
> > - connected ?
> > - connector_status_connected :
> > - connector_status_disconnected);
> > +   drm_bridge_hpd_cb(>bridge,
> > + connected ?
> > + connector_status_connected :
> > + connector_status_disconnected);
> > }
> >  }
> >
> > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c 
> > b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> > index dda4fa9a1a08..984ab5c4bc71 100644
> > --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
>

Re: [PATCH] drm: bridge: rename the function drm_bridge_hpd_notify to drm_bridge_hpd_cb

2021-03-30 Thread Robert Foss 
Hey Dafna,

Thanks for submitting a cleanup patch, it is much appreciated. It
looks good to me, feel free to add my r-b.

I'm not going to merge this right away, but will let this patch soak
for a while to let other people have a look at it.

On Tue, 30 Mar 2021 at 13:52, Dafna Hirschfeld
 wrote:
>
> drm_bridge_funcs has a function called 'hpd_notify'.
> The function drm_bridge_hpd_notify does not call
> 'hpd_notify' but it calls 'hpd_cb'. This is rather
> confusing. Rename the function to fix this confusion.
>
> Signed-off-by: Dafna Hirschfeld 
> ---
>  drivers/gpu/drm/bridge/adv7511/adv7511_drv.c| 2 +-
>  drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 4 ++--
>  drivers/gpu/drm/bridge/display-connector.c  | 2 +-
>  drivers/gpu/drm/bridge/lontium-lt9611uxc.c  | 8 
>  drivers/gpu/drm/bridge/synopsys/dw-hdmi.c   | 2 +-
>  drivers/gpu/drm/bridge/ti-tpd12s015.c   | 2 +-
>  drivers/gpu/drm/drm_bridge.c| 8 
>  include/drm/drm_bridge.h| 8 
>  8 files changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c 
> b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> index 76555ae64e9c..748f82910f4f 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> @@ -449,7 +449,7 @@ static void adv7511_hpd_work(struct work_struct *work)
> cec_phys_addr_invalidate(adv7511->cec_adap);
> drm_kms_helper_hotplug_event(adv7511->connector.dev);
> } else {
> -   drm_bridge_hpd_notify(>bridge, status);
> +   drm_bridge_hpd_cb(>bridge, status);
> }
> }
>  }
> diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c 
> b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
> index d0c65610ebb5..682da288ff6d 100644
> --- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
> +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
> @@ -794,7 +794,7 @@ static void cdns_mhdp_fw_cb(const struct firmware *fw, 
> void *context)
> if (mhdp->connector.dev)
> drm_kms_helper_hotplug_event(mhdp->bridge.dev);
> else
> -   drm_bridge_hpd_notify(>bridge, 
> cdns_mhdp_detect(mhdp));
> +   drm_bridge_hpd_cb(>bridge, 
> cdns_mhdp_detect(mhdp));
> }
>  }
>
> @@ -2314,7 +2314,7 @@ static irqreturn_t cdns_mhdp_irq_handler(int irq, void 
> *data)
> else
> 
> drm_kms_helper_hotplug_event(mhdp->bridge.dev);
> } else {
> -   drm_bridge_hpd_notify(>bridge, 
> cdns_mhdp_detect(mhdp));
> +   drm_bridge_hpd_cb(>bridge, 
> cdns_mhdp_detect(mhdp));
> }
> }
>
> diff --git a/drivers/gpu/drm/bridge/display-connector.c 
> b/drivers/gpu/drm/bridge/display-connector.c
> index 05eb759da6fc..8ccd69d7fe34 100644
> --- a/drivers/gpu/drm/bridge/display-connector.c
> +++ b/drivers/gpu/drm/bridge/display-connector.c
> @@ -98,7 +98,7 @@ static irqreturn_t display_connector_hpd_irq(int irq, void 
> *arg)
> struct display_connector *conn = arg;
> struct drm_bridge *bridge = >bridge;
>
> -   drm_bridge_hpd_notify(bridge, display_connector_detect(bridge));
> +   drm_bridge_hpd_cb(bridge, display_connector_detect(bridge));
>
> return IRQ_HANDLED;
>  }
> diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c 
> b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
> index fee27952ec6d..58f61b5da605 100644
> --- a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
> +++ b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
> @@ -175,10 +175,10 @@ static void lt9611uxc_hpd_work(struct work_struct *work)
> connected = lt9611uxc->hdmi_connected;
> mutex_unlock(>ocm_lock);
>
> -   drm_bridge_hpd_notify(>bridge,
> - connected ?
> - connector_status_connected :
> - connector_status_disconnected);
> +   drm_bridge_hpd_cb(>bridge,
> + connected ?
> + connector_status_connected :
> + connector_status_disconnected);
> }
>  }
>
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c 
> b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> index dda4fa9a1a08..984ab5c4bc71 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> @@ -3026,7 +3026,7 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id)
>
> if (hdmi->bridge.dev) {
> drm_helper_hpd_irq_event(hdmi->bridge.dev);
> -   drm_bridge_hpd_notify(>bridge, status);
>

[PATCH] drm: bridge: rename the function drm_bridge_hpd_notify to drm_bridge_hpd_cb

2021-03-30 Thread Dafna Hirschfeld 
drm_bridge_funcs has a function called 'hpd_notify'.
The function drm_bridge_hpd_notify does not call
'hpd_notify' but it calls 'hpd_cb'. This is rather
confusing. Rename the function to fix this confusion.

Signed-off-by: Dafna Hirschfeld 
---
 drivers/gpu/drm/bridge/adv7511/adv7511_drv.c| 2 +-
 drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 4 ++--
 drivers/gpu/drm/bridge/display-connector.c  | 2 +-
 drivers/gpu/drm/bridge/lontium-lt9611uxc.c  | 8 
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c   | 2 +-
 drivers/gpu/drm/bridge/ti-tpd12s015.c   | 2 +-
 drivers/gpu/drm/drm_bridge.c| 8 
 include/drm/drm_bridge.h| 8 
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c 
b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index 76555ae64e9c..748f82910f4f 100644
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -449,7 +449,7 @@ static void adv7511_hpd_work(struct work_struct *work)
cec_phys_addr_invalidate(adv7511->cec_adap);
drm_kms_helper_hotplug_event(adv7511->connector.dev);
} else {
-   drm_bridge_hpd_notify(>bridge, status);
+   drm_bridge_hpd_cb(>bridge, status);
}
}
 }
diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c 
b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
index d0c65610ebb5..682da288ff6d 100644
--- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
+++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
@@ -794,7 +794,7 @@ static void cdns_mhdp_fw_cb(const struct firmware *fw, void 
*context)
if (mhdp->connector.dev)
drm_kms_helper_hotplug_event(mhdp->bridge.dev);
else
-   drm_bridge_hpd_notify(>bridge, 
cdns_mhdp_detect(mhdp));
+   drm_bridge_hpd_cb(>bridge, 
cdns_mhdp_detect(mhdp));
}
 }
 
@@ -2314,7 +2314,7 @@ static irqreturn_t cdns_mhdp_irq_handler(int irq, void 
*data)
else
drm_kms_helper_hotplug_event(mhdp->bridge.dev);
} else {
-   drm_bridge_hpd_notify(>bridge, 
cdns_mhdp_detect(mhdp));
+   drm_bridge_hpd_cb(>bridge, 
cdns_mhdp_detect(mhdp));
}
}
 
diff --git a/drivers/gpu/drm/bridge/display-connector.c 
b/drivers/gpu/drm/bridge/display-connector.c
index 05eb759da6fc..8ccd69d7fe34 100644
--- a/drivers/gpu/drm/bridge/display-connector.c
+++ b/drivers/gpu/drm/bridge/display-connector.c
@@ -98,7 +98,7 @@ static irqreturn_t display_connector_hpd_irq(int irq, void 
*arg)
struct display_connector *conn = arg;
struct drm_bridge *bridge = >bridge;
 
-   drm_bridge_hpd_notify(bridge, display_connector_detect(bridge));
+   drm_bridge_hpd_cb(bridge, display_connector_detect(bridge));
 
return IRQ_HANDLED;
 }
diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c 
b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
index fee27952ec6d..58f61b5da605 100644
--- a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
+++ b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
@@ -175,10 +175,10 @@ static void lt9611uxc_hpd_work(struct work_struct *work)
connected = lt9611uxc->hdmi_connected;
mutex_unlock(>ocm_lock);
 
-   drm_bridge_hpd_notify(>bridge,
- connected ?
- connector_status_connected :
- connector_status_disconnected);
+   drm_bridge_hpd_cb(>bridge,
+ connected ?
+ connector_status_connected :
+ connector_status_disconnected);
}
 }
 
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c 
b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index dda4fa9a1a08..984ab5c4bc71 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -3026,7 +3026,7 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id)
 
if (hdmi->bridge.dev) {
drm_helper_hpd_irq_event(hdmi->bridge.dev);
-   drm_bridge_hpd_notify(>bridge, status);
+   drm_bridge_hpd_cb(>bridge, status);
}
}
 
diff --git a/drivers/gpu/drm/bridge/ti-tpd12s015.c 
b/drivers/gpu/drm/bridge/ti-tpd12s015.c
index e0e015243a60..2f079b6f51bc 100644
--- a/drivers/gpu/drm/bridge/ti-tpd12s015.c
+++ b/drivers/gpu/drm/bridge/ti-tpd12s015.c
@@ -103,7 +103,7 @@ static irqreturn_t tpd12s015_hpd_isr(int irq, void *data)
struct tpd12s015_device *tpd = data;
struct drm_bridge *bridge = >bridge;
 
-