|
@@ -118,19 +118,19 @@ static int omap_otg_probe(struct platform_device *pdev)
|
|
|
otg_dev->id_nb.notifier_call = omap_otg_id_notifier;
|
|
|
otg_dev->vbus_nb.notifier_call = omap_otg_vbus_notifier;
|
|
|
|
|
|
- ret = extcon_register_notifier(extcon, EXTCON_USB_HOST, &otg_dev->id_nb);
|
|
|
+ ret = devm_extcon_register_notifier(&pdev->dev, extcon,
|
|
|
+ EXTCON_USB_HOST, &otg_dev->id_nb);
|
|
|
if (ret)
|
|
|
return ret;
|
|
|
|
|
|
- ret = extcon_register_notifier(extcon, EXTCON_USB, &otg_dev->vbus_nb);
|
|
|
+ ret = devm_extcon_register_notifier(&pdev->dev, extcon,
|
|
|
+ EXTCON_USB, &otg_dev->vbus_nb);
|
|
|
if (ret) {
|
|
|
- extcon_unregister_notifier(extcon, EXTCON_USB_HOST,
|
|
|
- &otg_dev->id_nb);
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
- otg_dev->id = extcon_get_cable_state_(extcon, EXTCON_USB_HOST);
|
|
|
- otg_dev->vbus = extcon_get_cable_state_(extcon, EXTCON_USB);
|
|
|
+ otg_dev->id = extcon_get_state(extcon, EXTCON_USB_HOST);
|
|
|
+ otg_dev->vbus = extcon_get_state(extcon, EXTCON_USB);
|
|
|
omap_otg_set_mode(otg_dev);
|
|
|
|
|
|
rev = readl(otg_dev->base);
|
|
@@ -145,20 +145,8 @@ static int omap_otg_probe(struct platform_device *pdev)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int omap_otg_remove(struct platform_device *pdev)
|
|
|
-{
|
|
|
- struct otg_device *otg_dev = platform_get_drvdata(pdev);
|
|
|
- struct extcon_dev *edev = otg_dev->extcon;
|
|
|
-
|
|
|
- extcon_unregister_notifier(edev, EXTCON_USB_HOST, &otg_dev->id_nb);
|
|
|
- extcon_unregister_notifier(edev, EXTCON_USB, &otg_dev->vbus_nb);
|
|
|
-
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
static struct platform_driver omap_otg_driver = {
|
|
|
.probe = omap_otg_probe,
|
|
|
- .remove = omap_otg_remove,
|
|
|
.driver = {
|
|
|
.name = "omap_otg",
|
|
|
},
|