mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From 656f7fcb1272df590e10cb82e07cd2b79bbf60d1 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Holland <samuel@sholland.org>
|
|
Date: Wed, 13 Apr 2022 22:22:53 -0500
|
|
Subject: [PATCH] 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>
|
|
---
|
|
drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 10 ++++------
|
|
1 file changed, 4 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
|
|
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
|
|
@@ -927,13 +927,11 @@ static irqreturn_t rockchip_usb2phy_bval
|
|
|
|
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)
|