Commit c773bb0b authored by Chanwoo Choi's avatar Chanwoo Choi Committed by Felipe Balbi

usb: dwc3: omap: Replace the extcon API

This patch uses the resource-managed extcon API for extcon_register_notifier()
and replaces the deprecated extcon API as following:
- extcon_get_cable_state_() -> extcon_get_state()

Cc: linux-omap@vger.kernel.org
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Acked-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent ea07b8cf
...@@ -426,20 +426,20 @@ static int dwc3_omap_extcon_register(struct dwc3_omap *omap) ...@@ -426,20 +426,20 @@ static int dwc3_omap_extcon_register(struct dwc3_omap *omap)
} }
omap->vbus_nb.notifier_call = dwc3_omap_vbus_notifier; omap->vbus_nb.notifier_call = dwc3_omap_vbus_notifier;
ret = extcon_register_notifier(edev, EXTCON_USB, ret = devm_extcon_register_notifier(omap->dev, edev,
&omap->vbus_nb); EXTCON_USB, &omap->vbus_nb);
if (ret < 0) if (ret < 0)
dev_vdbg(omap->dev, "failed to register notifier for USB\n"); dev_vdbg(omap->dev, "failed to register notifier for USB\n");
omap->id_nb.notifier_call = dwc3_omap_id_notifier; omap->id_nb.notifier_call = dwc3_omap_id_notifier;
ret = extcon_register_notifier(edev, EXTCON_USB_HOST, ret = devm_extcon_register_notifier(omap->dev, edev,
&omap->id_nb); EXTCON_USB_HOST, &omap->id_nb);
if (ret < 0) if (ret < 0)
dev_vdbg(omap->dev, "failed to register notifier for USB-HOST\n"); dev_vdbg(omap->dev, "failed to register notifier for USB-HOST\n");
if (extcon_get_cable_state_(edev, EXTCON_USB) == true) if (extcon_get_state(edev, EXTCON_USB) == true)
dwc3_omap_set_mailbox(omap, OMAP_DWC3_VBUS_VALID); dwc3_omap_set_mailbox(omap, OMAP_DWC3_VBUS_VALID);
if (extcon_get_cable_state_(edev, EXTCON_USB_HOST) == true) if (extcon_get_state(edev, EXTCON_USB_HOST) == true)
dwc3_omap_set_mailbox(omap, OMAP_DWC3_ID_GROUND); dwc3_omap_set_mailbox(omap, OMAP_DWC3_ID_GROUND);
omap->edev = edev; omap->edev = edev;
...@@ -528,17 +528,13 @@ static int dwc3_omap_probe(struct platform_device *pdev) ...@@ -528,17 +528,13 @@ static int dwc3_omap_probe(struct platform_device *pdev)
ret = of_platform_populate(node, NULL, NULL, dev); ret = of_platform_populate(node, NULL, NULL, dev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to create dwc3 core\n"); dev_err(&pdev->dev, "failed to create dwc3 core\n");
goto err2; goto err1;
} }
dwc3_omap_enable_irqs(omap); dwc3_omap_enable_irqs(omap);
enable_irq(omap->irq); enable_irq(omap->irq);
return 0; return 0;
err2:
extcon_unregister_notifier(omap->edev, EXTCON_USB, &omap->vbus_nb);
extcon_unregister_notifier(omap->edev, EXTCON_USB_HOST, &omap->id_nb);
err1: err1:
pm_runtime_put_sync(dev); pm_runtime_put_sync(dev);
pm_runtime_disable(dev); pm_runtime_disable(dev);
...@@ -550,8 +546,6 @@ static int dwc3_omap_remove(struct platform_device *pdev) ...@@ -550,8 +546,6 @@ static int dwc3_omap_remove(struct platform_device *pdev)
{ {
struct dwc3_omap *omap = platform_get_drvdata(pdev); struct dwc3_omap *omap = platform_get_drvdata(pdev);
extcon_unregister_notifier(omap->edev, EXTCON_USB, &omap->vbus_nb);
extcon_unregister_notifier(omap->edev, EXTCON_USB_HOST, &omap->id_nb);
dwc3_omap_disable_irqs(omap); dwc3_omap_disable_irqs(omap);
disable_irq(omap->irq); disable_irq(omap->irq);
of_platform_depopulate(omap->dev); of_platform_depopulate(omap->dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment