From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753703AbdC1Emh (ORCPT ); Tue, 28 Mar 2017 00:42:37 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:63130 "EHLO epoutp02.samsung.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751668AbdC1Emf (ORCPT ); Tue, 28 Mar 2017 00:42:35 -0400 X-AuditID: b6c32a58-f79586d000001c40-20-58d9e99b8ffc From: Chanwoo Choi To: gregkh@linuxfoundation.org, matthias.bgg@gmail.com, chunfeng.yun@mediatek.com Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, chanwoo@kernel.org, Chanwoo Choi Subject: [PATCH] usb: mtu3: Replace the extcon API Date: Tue, 28 Mar 2017 13:42:02 +0900 Message-id: <1490676122-2655-1-git-send-email-cw00.choi@samsung.com> X-Mailer: git-send-email 1.8.0 X-Brightmail-Tracker: H4sIAAAAAAAAAzWSbUhTYRSAe3fv3Ye5uCzTFyMdtyQcuHb34a7iylBiUJLkn6nJuunFSfuw 3Snmn9KcX/ShpBAywywVzVpNKZNIUzNCIy2rWTglq5VYVkoEmTR37d9zznnOe14OR4hIRrFI YYHVwdittJngh6B3h2Nj41xfpg2K2ceAqvdOoVTVw2aUerPix6iz19x8yjP/GqNe9rv41Muz k4BqbXciVHmFKlmkv980I9B7umr4+oHmboG+5/ppfcXTAVR/obcL6Jc9UemCLCbJxNB5jF3K WHNteQXWfB1xMMOYYtTEK8g4MoHSElIrbWF0ROqh9LgDBebAxwhpMW0uCqTSaZYl9uxNstuK HIzUZGMdOiKbJJVyUqGVK5VKuVqVk6jUBJRjjKnBP48WLkpKnGNucAbU4LVAJIS4Gi6MuFGO w+GEz82vBSFCCd4G4NQ7j4ALqnjwXl0H/3/HUssNjCu4AJxw1/G44DeAvzxLyLrFx2Vw4LM3 2BGGZ8CV1VZkXULwYQCvrk5g64WtuBJ+7OwNMorHwBfP/UEW46nw1tcxhBsXBb8/eC/geJkP u7+G1gJhgHdAzyDCYSp82BvBGVvhwpPeDXs7/Nv2FqyPhXgVgD0uH8oF1QDOdpZhnKWCs3O+ 4CwE3wLP//nA4x4Vw+pKCafoYc+57o0d7YfjbZeCLMFz4LfBPqwObG8Bm7pAOFPIWvIZVlOo lrO0hS2y5stzbRYPCN6QzNAH1i4fGQK4EBCh4uT+aYMEo4vZU5YhAIUIESb+4AykxHn0qVLG bjPai8wMOwQ0gc3UI5Hbcm2Bi7Q6jKQ6QaHWxKsUKpJKICLEuztfGyR4Pu1gTjBMIWP/38cT iiLPgMbKmM/DW36UP/LKkjPtjabjoUPlrs0LHSLx3CcdNpsWkiWNTzx62ncnraLqyrR21Js2 mTkT53M2todLLi6WhMWO3My5IhKkKLPHbDvLmhtKEXC+OBr3h2QaXhlzFWbV4pxae7u5u/7w yf1THYY1Gblr37Mu7c/RppLo8b4oP4GyJpqUIXaW/geKppVJWQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBLMWRmVeSWpSXmKPExsVy+t9jQd3ZL29GGCxbqWAx8cYVFov2fXNZ LK5/ec5q0bx4PZvFpsfXWC0u75rDZnG5+SKjxaJlrcwWTS3GDpweO2fdZffYtKqTzWP/3DXs HpuX1Hu0nNzP4tG3ZRWjx+dNcgHsUW42GamJKalFCql5yfkpmXnptkqhIW66FkoKeYm5qbZK Ebq+IUFKCmWJOaVAnpEBGnBwDnAPVtK3S3DLmPL8MUvBG6GK1tPrGRsYOwW6GDk5JARMJN4v WM0KYYtJXLi3nq2LkYtDSGAWo8SOd1tYIZwfjBKX9l5iAaliE9CS2P/iBhuILSIQLPGj5Qgj SBGzwGFGiQcvz4AlhAWMJJ6u3AI2lkVAVeLS+edgNq+Ai8S6t6eZIdbJSXzY84h9AiP3AkaG VYwSqQXJBcVJ6blGeanlesWJucWleel6yfm5mxjBofxMegfj4V3uhxgFOBiVeHg1+G9GCLEm lhVX5h5ilOBgVhLhfdIKFOJNSaysSi3Kjy8qzUktPsRoCnTARGYp0eR8YJzllcQbmpibmBsb WJhbWpoYKYnzNs5+Fi4kkJ5YkpqdmlqQWgTTx8TBKdXA6Jjf8bwu/mtnYuz+qJOLVtycum0J nz7fc34GPx451bwDT66XP1lXF/iA6cDeRxuD72xoE2IVZmIQP7Z/ut3OSXWVf/Z/E1Lfdqr/ xWKtFGbuZzzz91/WC35e/HHCSp1nMXuDpX7tqp/h13IupKn4Y9zBnuW51cJ/8n+HXD14wUFI d3Wh3QyDk0osxRmJhlrMRcWJAJiACtF7AgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170328044203epcas5p3a1c11c5eae084c06cdc5291f37232b83 X-Msg-Generator: CA X-Sender-IP: 203.254.230.27 X-Local-Sender: =?UTF-8?B?7LWc7LCs7JqwG1RpemVuIFBsYXRmb3JtIExhYihTL1fshLw=?= =?UTF-8?B?7YSwKRvsgrzshLHsoITsnpAbU2VuaW9yIEVuZ2luZWVy?= X-Global-Sender: =?UTF-8?B?Q2hhbndvbyBDaG9pG1RpemVuIFBsYXRmb3JtIExhYi4bU2Ft?= =?UTF-8?B?c3VuZyBFbGVjdHJvbmljcxtTZW5pb3IgRW5naW5lZXI=?= X-Sender-Code: =?UTF-8?B?QzEwG1NUQUYbQzEwVjgxMTE=?= CMS-TYPE: 105P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20170328044203epcas5p3a1c11c5eae084c06cdc5291f37232b83 X-RootMTR: 20170328044203epcas5p3a1c11c5eae084c06cdc5291f37232b83 References: 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() Cc: Greg Kroah-Hartman Cc: Chunfeng Yun Cc: linux-usb@vger.kernel.org Signed-off-by: Chanwoo Choi --- drivers/usb/mtu3/mtu3_dr.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/drivers/usb/mtu3/mtu3_dr.c b/drivers/usb/mtu3/mtu3_dr.c index 1a8987e7c5b0..11a0d3b84c5e 100644 --- a/drivers/usb/mtu3/mtu3_dr.c +++ b/drivers/usb/mtu3/mtu3_dr.c @@ -223,25 +223,25 @@ static int ssusb_extcon_register(struct otg_switch_mtk *otg_sx) return 0; otg_sx->vbus_nb.notifier_call = ssusb_vbus_notifier; - ret = extcon_register_notifier(edev, EXTCON_USB, + ret = devm_extcon_register_notifier(ssusb->dev, edev, EXTCON_USB, &otg_sx->vbus_nb); if (ret < 0) dev_err(ssusb->dev, "failed to register notifier for USB\n"); otg_sx->id_nb.notifier_call = ssusb_id_notifier; - ret = extcon_register_notifier(edev, EXTCON_USB_HOST, + ret = devm_extcon_register_notifier(ssusb->dev, edev, EXTCON_USB_HOST, &otg_sx->id_nb); if (ret < 0) dev_err(ssusb->dev, "failed to register notifier for USB-HOST\n"); dev_dbg(ssusb->dev, "EXTCON_USB: %d, EXTCON_USB_HOST: %d\n", - extcon_get_cable_state_(edev, EXTCON_USB), - extcon_get_cable_state_(edev, EXTCON_USB_HOST)); + extcon_get_state(edev, EXTCON_USB), + extcon_get_state(edev, EXTCON_USB_HOST)); /* default as host, switch to device mode if needed */ - if (extcon_get_cable_state_(edev, EXTCON_USB_HOST) == false) + if (extcon_get_state(edev, EXTCON_USB_HOST) == false) ssusb_set_mailbox(otg_sx, MTU3_ID_FLOAT); - if (extcon_get_cable_state_(edev, EXTCON_USB) == true) + if (extcon_get_state(edev, EXTCON_USB) == true) ssusb_set_mailbox(otg_sx, MTU3_VBUS_VALID); return 0; @@ -367,13 +367,6 @@ void ssusb_otg_switch_exit(struct ssusb_mtk *ssusb) cancel_delayed_work(&otg_sx->extcon_reg_dwork); - if (otg_sx->edev) { - extcon_unregister_notifier(otg_sx->edev, - EXTCON_USB, &otg_sx->vbus_nb); - extcon_unregister_notifier(otg_sx->edev, - EXTCON_USB_HOST, &otg_sx->id_nb); - } - if (otg_sx->manual_drd_enabled) ssusb_debugfs_exit(ssusb); } -- 1.9.1