phy: rockchip-inno-usb2: Do not check bvalid twice

The bvalid interrupt handler already checks bvalid status. The muxed IRQ
handler just needs to call the other handler (plus any other handlers
that will be added).

Signed-off-by: Samuel Holland <samuel@sholland.org>
Tested-by: Michael Riesch <michael.riesch@wolfvision.net>
Link: https://lore.kernel.org/r/20220414032258.40984-3-samuel@sholland.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index cba5c32..29407b3 100644 (file)
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -919,13 +919,11 @@ static irqreturn_t rockchip_usb2phy_bvalid_irq(int irq, void *data)
 
 static irqreturn_t rockchip_usb2phy_otg_mux_irq(int irq, void *data)
 {
-       struct rockchip_usb2phy_port *rport = data;
-       struct rockchip_usb2phy *rphy = dev_get_drvdata(rport->phy->dev.parent);
+       irqreturn_t ret = IRQ_NONE;
 
-       if (property_enabled(rphy->grf, &rport->port_cfg->bvalid_det_st))
-               return rockchip_usb2phy_bvalid_irq(irq, data);
-       else
-               return IRQ_NONE;
+       ret |= rockchip_usb2phy_bvalid_irq(irq, data);
+
+       return ret;
 }
 
 static irqreturn_t rockchip_usb2phy_irq(int irq, void *data)