From patchwork Mon Jul 17 01:20:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chanwoo Choi X-Patchwork-Id: 9843817 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 164C260392 for ; Mon, 17 Jul 2017 01:22:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 079992821F for ; Mon, 17 Jul 2017 01:22:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F036628338; Mon, 17 Jul 2017 01:22:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9EC5B2832B for ; Mon, 17 Jul 2017 01:22:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-reply-to:Message-id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=jgjVPXF48LGYmjP1C4bzBJ33ztp9iKHoep3zM0lxOsI=; b=N6CGYQ6L+ONL4cdjWndkeI+x/N 3Lk1v0dDZYKgNGW5M8mVmV4VjjjGjj3lWUBdPXfj4evVp8aMOF7EhwZHi+VzsEZb2NukQSg/TdM7i wCHb5zXzWWaaqXmSzCTs4y4VO3Ogx/6eKlewbusBqtmx9dftledKgPgSwqOPfPNOSE+nfVbnnEAkk uvPce2LFsXkaFqsr0aGtdp08xFxVttK7rqNSLqcc91ita0D8k62PqSLZ3+Qg/+x3xcGCv4gbQvi8z +pA9mO+eCH/IHdhXuG0asSAUS7Y2dhstc7qhKetYqsfI2DgeIlRcxRYek913XywZIXANn0HHrOGgF bf7lXw3g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dWujz-0000Z4-Et; Mon, 17 Jul 2017 01:22:27 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dWuiy-000857-RZ; Mon, 17 Jul 2017 01:21:28 +0000 Received: from epcas1p2.samsung.com (unknown [182.195.41.46]) by mailout1.samsung.com (KnoxPortal) with ESMTP id 20170717012058epoutp017390fe00bf08d99cacb16cc9b9291b41~R_XtGXoPD0997109971epoutp01X; Mon, 17 Jul 2017 01:20:58 +0000 (GMT) Received: from epsmges1p2.samsung.com (unknown [182.195.40.66]) by epcas1p2.samsung.com (KnoxPortal) with ESMTP id 20170717012058epcas1p2af6cd3f9070e8b1af2f9c29fb10e30bb~R_Xs3qSSn0514305143epcas1p2M; Mon, 17 Jul 2017 01:20:58 +0000 (GMT) Received: from epcas1p1.samsung.com ( [182.195.41.45]) by epsmges1p2.samsung.com (Symantec Messaging Gateway) with SMTP id 5C.76.06750.AF01C695; Mon, 17 Jul 2017 10:20:58 +0900 (KST) Received: from epsmgms2p1.samsung.com (unknown [182.195.42.79]) by epcas1p1.samsung.com (KnoxPortal) with ESMTP id 20170717012058epcas1p157e9a296eb5e415ae24bb51a1e6026db~R_XslyLwn1728317283epcas1p11; Mon, 17 Jul 2017 01:20:58 +0000 (GMT) X-AuditID: b6c32a36-f79db6d000001a5e-64-596c10fa57ea Received: from epmmp1.local.host ( [203.254.227.16]) by epsmgms2p1.samsung.com (Symantec Messaging Gateway) with SMTP id C2.E5.05076.AF01C695; Mon, 17 Jul 2017 10:20:58 +0900 (KST) Received: from localhost.localdomain ([10.113.62.212]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OT7001NHNQX1OA0@mmp1.samsung.com>; Mon, 17 Jul 2017 10:20:57 +0900 (KST) From: Chanwoo Choi To: kishon@ti.com, balbi@kernel.org, gregkh@linuxfoundation.org Subject: [PATCH 2/5] phy: rockchip-inno-usb2: Replace the extcon API Date: Mon, 17 Jul 2017 10:20:53 +0900 Message-id: <1500254456-6525-3-git-send-email-cw00.choi@samsung.com> X-Mailer: git-send-email 1.8.0 In-reply-to: <1500254456-6525-1-git-send-email-cw00.choi@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMKsWRmVeSWpSXmKPExsWy7bCmru4vgZxIg60XZCyOtT1ht5h44wqL xfUvz1ktmhevZ7O48LSHzWLT42usFpd3zWGz+PTgP7PFomWtzBa3G1ewOXB5bFrVyeaxf+4a do/NS+o9+rasYvQ4fmM7k8fnTXIBbFGpNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaGuoaW FuZKCnmJuam2Si4+AbpumTlAlykplCXmlAKFAhKLi5X07WyK8ktLUhUy8otLbJWiDQ2N9AwN zPWMjIz0TIxjrYxMgUoSUjPOHX7LVLBZuOLv+Q+sDYxbBboYOTkkBEwkju9dxAphi0lcuLee rYuRi0NIYAejxPVtv1kgnM+MEhMnPWSD6Xj0ZBYjiA1W1TzdB6LoB6PE1QNbWEASbAJaEvtf 3ABq4OAQEbCX2PwuC6SGWeAco8ScTwfAaoQFXCS6Dz5hArFZBFQlpm48CHYGL1D87ZkeZohl chIf9jxiB7E5BVwlzn89wQoySEKgmV3i9JsjTCALJARkJTYdgKp3kXhztgXqHWGJV8e3sEPY UhKNLx8yQfS2M0psnnOPBcLpYJS4v7IRqsNY4lRXI9hFzAJ8Eu++9rBCLOCV6GgTgjA9JCZ8 hJrpKLF20xdocM1glFi7bhrbBEaZBYwMqxjFUguKc9NTiw0LjPSKE3OLS/PS9ZLzczcxghOU ltkOxkXnfA4xCnAwKvHwNiRmRQqxJpYVV+YeYpTgYFYS4VXjzYkU4k1JrKxKLcqPLyrNSS0+ xGgKDKeJzFKiyfnA5JlXEm9oYmlgYmYETCOWhoZK4ryi669FCAmkJ5akZqemFqQWwfQxcXBK NTBm5BqmhXmHc3/kKXRv7k0vKdawyvyprm7/7puuq2DO676j5/+H7Dsep808yVbo46MHfDvV klrEOoWaD5opeCckzVGtuirqML8wJef3QaPH9W8iDRk1ONTVpx4UOJs4P/Gduuc20TXrvfYb 7gqOVZuf/GXjnH38a2W0g7ycbwgn31G8PqX4sBJLcUaioRZzUXEiABYzymhmAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrELMWRmVeSWpSXmKPExsVy+t9jAd1fAjmRBuv3cVkca3vCbjHxxhUW i+tfnrNaNC9ez2Zx4WkPm8Wmx9dYLS7vmsNm8enBf2aLRctamS1uN65gc+Dy2LSqk81j/9w1 7B6bl9R79G1Zxehx/MZ2Jo/Pm+QC2KLcbDJSE1NSixRS85LzUzLz0m2VQkPcdC2UFPISc1Nt lSJ0fUOClBTKEnNKgTwjAzTg4BzgHqykb5fglnHu8Fumgs3CFX/Pf2BtYNwq0MXIySEhYCLx 6MksRghbTOLCvfVsXYxcHEIC2xgllv6ZwQLh/GCUWPhtMQtIFZuAlsT+FzeAqjg4RATsJTa/ ywKpYRY4xyixZ+1pJpAaYQEXie6DT8BsFgFViakbD7KC2LxA8bdnepghtslJfNjziB3E5hRw lTj/9QRYjRBQzeE5C1knMPIuYGRYxciVWlCcm55bbFRguIkRGN7bDmv572D8cTb6EKMAB6MS D++N5KxIIdbEsuLK3EOMEhzMSiK8arw5kUK8KYmVValF+fFFpTmpxYcYTYFOmcgsJZqcD4y9 vJJ4QxNLIxMDMzNDIwNjMyVx3gmBXyKEBNITS1KzU1MLUotg+pg4OKUaGKXkfwmcPlBja2dz dOlL148HLX5v5HdN8kz47BiVsm4fv5pC+XEDP//d264HrNg47e/btJuHg/dGSXIqiZoeXdR4 k39jY1lw4s+bvzfdMbZ4dGyywu6D3XdOdL38rKP6Wu6uVdq0qKeWPw868s6Qt15oPJv9wiRj M5baBxYPVvvqF5+fe0d3kqMSS3FGoqEWc1FxIgDj1K4EhQIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170717012058epcas1p157e9a296eb5e415ae24bb51a1e6026db X-Msg-Generator: CA X-Sender-IP: 182.195.42.79 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?QzEwG1RFTEUbQzEwVjgxMTE=?= CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20170717012058epcas1p157e9a296eb5e415ae24bb51a1e6026db X-RootMTR: 20170717012058epcas1p157e9a296eb5e415ae24bb51a1e6026db References: <1500254456-6525-1-git-send-email-cw00.choi@samsung.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170716_182125_233710_2CA6F51B X-CRM114-Status: GOOD ( 11.10 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, cw00.choi@samsung.com, myungjoo.ham@samsung.com, chanwoo@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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() - extcon_set_cable_state_() -> extcon_set_state_sync() Cc: linux-rockchip@lists.infradead.org acked-by: Kishon Vijay Abraham I Signed-off-by: Chanwoo Choi --- drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c index 626883d9d176..ef033089b7a0 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c @@ -545,7 +545,7 @@ static void rockchip_usb2phy_otg_sm_work(struct work_struct *work) rockchip_usb2phy_power_off(rport->phy); /* fall through */ case OTG_STATE_B_IDLE: - if (extcon_get_cable_state_(rphy->edev, EXTCON_USB_HOST) > 0) { + if (extcon_get_state(rphy->edev, EXTCON_USB_HOST) > 0) { dev_dbg(&rport->phy->dev, "usb otg host connect\n"); rport->state = OTG_STATE_A_HOST; rockchip_usb2phy_power_on(rport->phy); @@ -598,7 +598,7 @@ static void rockchip_usb2phy_otg_sm_work(struct work_struct *work) rport->vbus_attached = vbus_attach; if (notify_charger && rphy->edev) { - extcon_set_cable_state_(rphy->edev, + extcon_set_state_sync(rphy->edev, cable, vbus_attach); if (cable == EXTCON_CHG_USB_SDP) extcon_set_state_sync(rphy->edev, @@ -619,7 +619,7 @@ static void rockchip_usb2phy_otg_sm_work(struct work_struct *work) sch_work = true; break; case OTG_STATE_A_HOST: - if (extcon_get_cable_state_(rphy->edev, EXTCON_USB_HOST) == 0) { + if (extcon_get_state(rphy->edev, EXTCON_USB_HOST) == 0) { dev_dbg(&rport->phy->dev, "usb otg host disconnect\n"); rport->state = OTG_STATE_B_IDLE; rockchip_usb2phy_power_off(rport->phy); @@ -1006,8 +1006,8 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy, if (!IS_ERR(rphy->edev)) { rport->event_nb.notifier_call = rockchip_otg_event; - ret = extcon_register_notifier(rphy->edev, EXTCON_USB_HOST, - &rport->event_nb); + ret = devm_extcon_register_notifier(rphy->dev, rphy->edev, + EXTCON_USB_HOST, &rport->event_nb); if (ret) dev_err(rphy->dev, "register USB HOST notifier failed\n"); }