usb: host: tegra: Remove manual wake IRQ disposal
Subsystems (3)
PATCH 1/1 usb: host: tegra: Remove manual wake IRQ disposal
From: Wayne Chang <[email protected]>
We found that calling irq_dispose_mapping() caused a kernel warning when removing the driver. The IRQs are obtained using platform_get_irq(), which returns a Linux virtual IRQ number directly managed by the device core, not by the OF subsystem. Therefore, the driver should not call irq_dispose_mapping() for these IRQs.
Fixes 5df186e2ef11 ("usb: xhci: tegra: Support USB wakeup function for Tegra234")
Signed-off-by Wayne Chang <[email protected]>
Signed-off-by Wei-Cheng Chen <[email protected]>
--- drivers/usb/host/xhci-tegra.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-)
drivers/usb/host/xhci-tegra.c +2 -19
@@ -1570,7 +1570,6 @@ static int tegra_xusb_setup_wakeup(struct platform_device *pdev, struct tegra_xu data =irq_get_irq_data (tegra->wake_irqs[i]);if (!data) {dev_warn (tegra->dev,"get wake event %d irq data fail\n" , i); -irq_dispose_mapping (tegra->wake_irqs[i]);break ; }
@@ -1583,16 +1582,6 @@ static int tegra_xusb_setup_wakeup(struct platform_device *pdev, struct tegra_xureturn 0 ; } -static void tegra_xusb_dispose_wake (struct tegra_xusb *tegra) -{ -unsigned int i; - -for (i =0 ; i < tegra->num_wakes; i++) -irq_dispose_mapping (tegra->wake_irqs[i]); - - tegra->num_wakes =0 ; -} -static int tegra_xusb_probe (struct platform_device *pdev) {struct tegra_xusb *tegra;
@@ -1648,10 +1637,8 @@ static int tegra_xusb_probe(struct platform_device *pdev)return err; tegra->padctl =tegra_xusb_padctl_get (&pdev->dev); -if (IS_ERR (tegra->padctl)) { - err =PTR_ERR (tegra->padctl); - goto dispose_wake; - } +if (IS_ERR (tegra->padctl)) +return PTR_ERR (tegra->padctl); np =of_parse_phandle (pdev->dev.of_node,"nvidia,xusb-padctl" ,0 );if (!np) {
@@ -1975,8 +1962,6 @@ static int tegra_xusb_probe(struct platform_device *pdev) put_padctl:of_node_put (np);tegra_xusb_padctl_put (tegra->padctl); -dispose_wake: -tegra_xusb_dispose_wake (tegra);return err; }
@@ -2009,8 +1994,6 @@ static void tegra_xusb_remove(struct platform_device *pdev)if (tegra->padctl_irq)pm_runtime_disable (&pdev->dev); -tegra_xusb_dispose_wake (tegra); -pm_runtime_put (&pdev->dev);tegra_xusb_disable (tegra);
Signature · 1 line
2.43.0