|
@@ -2077,7 +2077,7 @@ static irqreturn_t dw_hdmi_hardirq(int irq, void *dev_id)
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-void __dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool hpd, bool rx_sense)
|
|
|
+void dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool hpd, bool rx_sense)
|
|
|
{
|
|
|
mutex_lock(&hdmi->mutex);
|
|
|
|
|
@@ -2103,13 +2103,6 @@ void __dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool hpd, bool rx_sense)
|
|
|
}
|
|
|
mutex_unlock(&hdmi->mutex);
|
|
|
}
|
|
|
-
|
|
|
-void dw_hdmi_setup_rx_sense(struct device *dev, bool hpd, bool rx_sense)
|
|
|
-{
|
|
|
- struct dw_hdmi *hdmi = dev_get_drvdata(dev);
|
|
|
-
|
|
|
- __dw_hdmi_setup_rx_sense(hdmi, hpd, rx_sense);
|
|
|
-}
|
|
|
EXPORT_SYMBOL_GPL(dw_hdmi_setup_rx_sense);
|
|
|
|
|
|
static irqreturn_t dw_hdmi_irq(int irq, void *dev_id)
|
|
@@ -2145,9 +2138,9 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id)
|
|
|
*/
|
|
|
if (intr_stat &
|
|
|
(HDMI_IH_PHY_STAT0_RX_SENSE | HDMI_IH_PHY_STAT0_HPD)) {
|
|
|
- __dw_hdmi_setup_rx_sense(hdmi,
|
|
|
- phy_stat & HDMI_PHY_HPD,
|
|
|
- phy_stat & HDMI_PHY_RX_SENSE);
|
|
|
+ dw_hdmi_setup_rx_sense(hdmi,
|
|
|
+ phy_stat & HDMI_PHY_HPD,
|
|
|
+ phy_stat & HDMI_PHY_RX_SENSE);
|
|
|
|
|
|
if ((phy_stat & (HDMI_PHY_RX_SENSE | HDMI_PHY_HPD)) == 0)
|
|
|
cec_notifier_set_phys_addr(hdmi->cec_notifier,
|