|
@@ -759,8 +759,8 @@ static int ci_hdrc_probe(struct platform_device *pdev)
|
|
}
|
|
}
|
|
|
|
|
|
platform_set_drvdata(pdev, ci);
|
|
platform_set_drvdata(pdev, ci);
|
|
- ret = request_irq(ci->irq, ci_irq, IRQF_SHARED, ci->platdata->name,
|
|
|
|
- ci);
|
|
|
|
|
|
+ ret = devm_request_irq(dev, ci->irq, ci_irq, IRQF_SHARED,
|
|
|
|
+ ci->platdata->name, ci);
|
|
if (ret)
|
|
if (ret)
|
|
goto stop;
|
|
goto stop;
|
|
|
|
|
|
@@ -771,7 +771,6 @@ static int ci_hdrc_probe(struct platform_device *pdev)
|
|
if (!ret)
|
|
if (!ret)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
- free_irq(ci->irq, ci);
|
|
|
|
stop:
|
|
stop:
|
|
ci_role_destroy(ci);
|
|
ci_role_destroy(ci);
|
|
deinit_phy:
|
|
deinit_phy:
|
|
@@ -785,7 +784,6 @@ static int ci_hdrc_remove(struct platform_device *pdev)
|
|
struct ci_hdrc *ci = platform_get_drvdata(pdev);
|
|
struct ci_hdrc *ci = platform_get_drvdata(pdev);
|
|
|
|
|
|
dbg_remove_files(ci);
|
|
dbg_remove_files(ci);
|
|
- free_irq(ci->irq, ci);
|
|
|
|
ci_role_destroy(ci);
|
|
ci_role_destroy(ci);
|
|
ci_hdrc_enter_lpm(ci, true);
|
|
ci_hdrc_enter_lpm(ci, true);
|
|
ci_usb_phy_exit(ci);
|
|
ci_usb_phy_exit(ci);
|