Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d0184d0 authored by Felipe Balbi's avatar Felipe Balbi
Browse files

usb: dwc3: omap: call of_platform_depopulate() instead 



This patch fixes a bug where removing dwc3-omap.ko
would not trigger removal of dwc3.ko.

of_platform_depopulate() already bakes an easy to
use API for removing all our children which were
populated during probe(); Let's use that one instead
of cooking our own solution.

Note that this is kind of a revert of commit c5a1fbca
(usb: dwc3: dwc3-omap: Fix the crash on module removal)
although we can't simply revert that because a direct
call to platform_device_unregister would also be flakey.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 3da1f6ee

drivers/usb/dwc3/dwc3-omap.c

+1 −10
Original line number Diff line number Diff line
@@ -325,15 +325,6 @@ static irqreturn_t dwc3_omap_interrupt(int irq, void *_omap) 
	return IRQ_HANDLED;

}



static int dwc3_omap_remove_core(struct device *dev, void *c)

{

	struct platform_device *pdev = to_platform_device(dev);



	of_device_unregister(pdev);



	return 0;

}



static void dwc3_omap_enable_irqs(struct dwc3_omap *omap)

{

	u32			reg;
@@ -600,7 +591,7 @@ static int dwc3_omap_remove(struct platform_device *pdev) 
	if (omap->extcon_id_dev.edev)

		extcon_unregister_interest(&omap->extcon_id_dev);

	dwc3_omap_disable_irqs(omap);

	device_for_each_child(&pdev->dev, NULL, dwc3_omap_remove_core);

	of_platform_depopulate(omap->dev);

	pm_runtime_put_sync(&pdev->dev);

	pm_runtime_disable(&pdev->dev);