From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753669AbcL3EJl (ORCPT ); Thu, 29 Dec 2016 23:09:41 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:56998 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753389AbcL3EIW (ORCPT ); Thu, 29 Dec 2016 23:08:22 -0500 X-AuditID: b6c32a58-f79726d000001ac1-60-5865ddb04737 From: Chanwoo Choi To: balbi@kernel.org, gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, linux-omap@vger.kernel.org, linux-renesas-soc@vger.kernel.org, chanwoo@kernel.org, Chanwoo Choi Subject: [PATCH v2 1/6] usb: dwc3: omap: Replace the extcon API Date: Fri, 30 Dec 2016 13:08:10 +0900 Message-id: <1483070895-8213-2-git-send-email-cw00.choi@samsung.com> X-Mailer: git-send-email 1.8.0 In-reply-to: <1483070895-8213-1-git-send-email-cw00.choi@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDKsWRmVeSWpSXmKPExsWy7bCmlu6Gu6kRBv3bLC2OtT1ht5h44wqL xfUvz1ktmhevZ7O4vGsOm8XsJf0sFltfvmOyWLSsldmBw2PTqk42j/1z17B79G1ZxejxeZNc AEtUqk1GamJKapFCal5yfkpmXrqtkndwvHO8qZmBoa6hpYW5kkJeYm6qrZKLT4CuW2YO0BlK CmWJOaVAoYDE4mIlfTubovzSklSFjPziElulaENDIz1DA3M9IyMjPRPjWCsjU6CShNSMg6s/ MRUcFKlo+2jYwLhMsIuRk0NCwETi9MO3LBC2mMSFe+vZuhi5OIQEljJKzP+zjRkkISTQziRx vtkYpuHL5jvMEEVzGCU2bWqFKvrBKHFrkwyIzSagJbH/xQ2gSRwcIgIGEm03xEDCzAI7GCW2 f60GCQsL2EvsbK8ACbMIqEp86JwAdgOvgIvE/RXrmCFWyUl82POIHcTmFHCVeLftHCvIWgmB z2wSP1b2s4DMkRCQldh0AKreRWLm4XlsELawxKvjW9ghbGmJv0tvMUL0TmaU6Fr7lxnC6WGU aFxzFKrDWOL+g3vMEIfySfT+fsIEsYBXoqNNCKLEQ+L6sclMELajROPh5UwQr89glGi6ZDyB UWYBI8MqRrHUguLc9NRi0wITveLE3OLSvHS95PzcTYzglKMVsYPx34ygQ4wCHIxKPLw/ylIj hFgTy4orcw8xSnAwK4nwFt4GCvGmJFZWpRblxxeV5qQWH2I0BYbTRGYp0eR8YDrMK4k3NDEz NDGyBEJzQ3Mlcd4FFdYRQgLpiSWp2ampBalFMH1MHJxSDYz5fQuU9K5xnLaafy2M7X9kgmzL MxON26Zubc2Lzsxeu0XLsb5dalv6vyubHr1hLP6+MpTDYrNs9rVt2zZK51iqbf/Qft2YdfF7 qWlnBP/y6Yt+7jjWeKGuMK56oRRLcdKMuJQJsnvEz2j9njpr+frJmqyME4uZj3y9u5zjn2Bs hfo2kTeuValKLMUZiYZazEXFiQAsocjOTwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNLMWRmVeSWpSXmKPExsVy+t9jQd0Nd1MjDBb917Q41vaE3WLijSss Fte/PGe1aF68ns3i8q45bBazl/SzWGx9+Y7JYtGyVmYHDo9NqzrZPPbPXcPu0bdlFaPH501y ASxRbjYZqYkpqUUKqXnJ+SmZeem2SqEhbroWSgp5ibmptkoRur4hQUoKZYk5pUCekQEacHAO cA9W0rdLcMs4uPoTU8FBkYq2j4YNjMsEuxg5OSQETCS+bL7DDGGLSVy4t56ti5GLQ0hgFqPE kkMHWCGcH4wS3be+sIFUsQloSex/cQPI5uAQETCQaLshBlLDLLCDUWLe0tNgcWEBe4md7RUg 5SwCqhIfOiewgNi8Ai4S91esg1omJ/FhzyN2EJtTwFXi3bZzrCC2EFDN8jNn2Ccw8i5gZFjF KJFakFxQnJSea5SXWq5XnJhbXJqXrpecn7uJERzQz6R3MB7e5X6IUYCDUYmH90dZaoQQa2JZ cWXuIUYJDmYlEd7C20Ah3pTEyqrUovz4otKc1OJDjKZAh01klhJNzgdGW15JvKGJuYm5sYGF uaWliZGSOG/j7GfhQgLpiSWp2ampBalFMH1MHJxSDYy9j3etunz736fsV+d3pW+fqrj6oPzr xfNXLjsY5G7PoHRbJTn8pel/C9t0fi6JIueUTaFzz16bG1u81X/iiu0cXwIXtp7atJl596+K xkNaz+rU5k96ePJIzooTKyKC8qOPBgklbsu7F1ys+n2J5oHNwbfb05dsnmW80/PWkU2z5rK9 S9ipu124WomlOCPRUIu5qDgRAL6WO6x+AgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20161230040816epcas5p4c76ef8f364678a34e2a0ff67b0119ef9 X-Msg-Generator: CA X-Sender-IP: 203.254.230.27 X-Local-Sender: =?UTF-8?B?7LWc7LCs7JqwG1RpemVuIFBsYXRmb3JtIExhYihTL1fshLw=?= =?UTF-8?B?7YSwKRvsgrzshLHsoITsnpAbUzUo7LGF7J6EKS9DaGFuZ2UgQWdlbnQ=?= X-Global-Sender: =?UTF-8?B?Q2hhbndvbyBDaG9pG1RpemVuIFBsYXRmb3JtIExhYi4bU2Ft?= =?UTF-8?B?c3VuZyBFbGVjdHJvbmljcxtTNS9TZW5pb3IgRW5naW5lZXI=?= X-Sender-Code: =?UTF-8?B?QzEwG1NUQUYbQzEwVjgxMTE=?= CMS-TYPE: 105P DLP-Filter: Pass X-CFilter-Loop: Reflected X-HopCount: 7 X-CMS-RootMailID: 20161230040816epcas5p4c76ef8f364678a34e2a0ff67b0119ef9 X-RootMTR: 20161230040816epcas5p4c76ef8f364678a34e2a0ff67b0119ef9 References: <1483070895-8213-1-git-send-email-cw00.choi@samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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() Signed-off-by: Chanwoo Choi Acked-by: Felipe Balbi --- drivers/usb/dwc3/dwc3-omap.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c index 29e80cc9b634..2d2e9aa1db08 100644 --- a/drivers/usb/dwc3/dwc3-omap.c +++ b/drivers/usb/dwc3/dwc3-omap.c @@ -425,20 +425,20 @@ static int dwc3_omap_extcon_register(struct dwc3_omap *omap) } omap->vbus_nb.notifier_call = dwc3_omap_vbus_notifier; - ret = extcon_register_notifier(edev, EXTCON_USB, - &omap->vbus_nb); + ret = devm_extcon_register_notifier(omap->dev, edev, + EXTCON_USB, &omap->vbus_nb); if (ret < 0) dev_vdbg(omap->dev, "failed to register notifier for USB\n"); omap->id_nb.notifier_call = dwc3_omap_id_notifier; - ret = extcon_register_notifier(edev, EXTCON_USB_HOST, - &omap->id_nb); + ret = devm_extcon_register_notifier(omap->dev, edev, + EXTCON_USB_HOST, &omap->id_nb); if (ret < 0) 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); - 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); omap->edev = edev; @@ -527,17 +527,13 @@ static int dwc3_omap_probe(struct platform_device *pdev) ret = of_platform_populate(node, NULL, NULL, dev); if (ret) { dev_err(&pdev->dev, "failed to create dwc3 core\n"); - goto err2; + goto err1; } dwc3_omap_enable_irqs(omap); 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: pm_runtime_put_sync(dev); pm_runtime_disable(dev); @@ -549,8 +545,6 @@ static int dwc3_omap_remove(struct platform_device *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); of_platform_depopulate(omap->dev); pm_runtime_put_sync(&pdev->dev); -- 1.9.1