From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752215AbcL3Igb (ORCPT ); Fri, 30 Dec 2016 03:36:31 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:40415 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751683AbcL3Ig3 (ORCPT ); Fri, 30 Dec 2016 03:36:29 -0500 MIME-version: 1.0 Content-type: text/plain; charset=UTF-8 X-AuditID: b6c32a38-f79156d000000aca-83-58661c8baa03 Content-transfer-encoding: 8BIT Message-id: <58661C8A.7060504@samsung.com> Date: Fri, 30 Dec 2016 17:36:26 +0900 From: Chanwoo Choi Organization: Samsung Electronics User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 To: Peter.Chen@nxp.com, gregkh@linuxfoundation.org Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, chanwoo@kernel.org Subject: Re: [PATCH v2] usb: chipdata: Replace the extcon API In-reply-to: <1483071340-8559-1-git-send-email-cw00.choi@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA01Sa0hTYRjm2znbjtLytFJfV9Y60Y8Grp3Tpqs0ulgMNDAMHEXYST8vtIvu TMnE2ghbmUQXKDOli2Apxcwu2nU1W0EXu1hit6lEIP4wLDIjrbYdo/497/M+7+3hpQilW6ai im1O7LDxFkYWTV7rWqRLOjCnwKyrOxZlPNz3ijTuafLKjD03GmTGs83VhHEi+F66Umpqb90v M/kaL8hNl0Y6Jaav7XOzyE04tQjz+dihxrY8e36xrTCNycjOXZNrSNaxSexSYwqjtvFWnMak Z2YlrSu2hOYy6nLeUhaisnhBYBavSHXYy5xYXWQXnGnMZpbltKwuRctxnFa/ZMsyzhCSbMVF XwJBacmJOTu6PfEudC+uBkVRQOvh2X2PTMRx8DzoDeFoSkl3Ihhra0Ji4JHA0Ggt8bfi88Tr qcQ5BHc+TaJwQkHPgPGjQbIGURRBz4P7L7eHaYJeBFdveuWiPojA33NCHtYoaA14AlvDGpJe CAPeu2QYy0K0b6gvslEMPR9ej3+MtI+lzXD91Jg8jGfRHPgePEZi/w1Q72qQhlvOpNNgrEYa pqPotXCwpTFyDNDNcvCNDEY0QCdC+92pU9JhuK9fIuKZMPzwilzEs6H111uJWHsUQc3FSUIM ahG4LwSm7FoC/QNBQlxiOox8q50aoIB9e5UiNMHvO6WiehX8qOskRRvqEAwNuMhDSF3/n3P1 /5yr/8+504hoRXG4RLAWYoEt0WsF3iqU2Qq1eXZrO4q8n8bYiW51Z/oRTSFmmuJ8JTYrpXy5 UGH1I6AIZpaiYHaBWanI5yt2Yoc911FmwYIfGULOHyZUsXn20DPbnLmsPpnVc3qWTeF0HBOv aHIvNyvpQt6Jt2Ncgh1/6yRUlMqFEk/uNuQ9amBVm73bjlcNV1VpX45LXcMWc3Wg7c2j1cmZ 71L5taVkkqzKXX4mNrCg0pWxp3Hj4IuYhJZtpCZB3ePr6NiPeqtjt1Tu0nx4OvEzZ6D6e6b/ cu/6vV2HJh8n1jVcSVjJ384hs5+wV12jblWyQZkd9HQd6eh3StmFLQwpFPGshnAI/B+XCp+0 lAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrLIsWRmVeSWpSXmKPExsVy+t9jAd0umbQIg/MTrSwm3rjCYtG8eD2b xeVdc9gsFi1rZbb4c+8OqwOrx6ZVnWwe++euYffY+G4Hk8fnTXIBLFFuNhmpiSmpRQqpecn5 KZl56bZKoSFuuhZKCnmJuam2ShG6viFBSgpliTmlQJ6RARpwcA5wD1bSt0twy/h09B5rwUyZ inPt4g2MB8W6GDk5JARMJN7/ucoIYYtJXLi3nq2LkYtDSGApo0TL3lvsIAleAUGJH5PvsXQx cnAwC8hLHLmUDRJmFlCXmDRvETNE/QNGibu3jzGD1PAKaEm0H00AqWERUJV4sP4AC4jNBhTe /+IGG4jNL6AocfXHY0aQclGBCInuE5UgYREBI4n9x04zQoz3l3j18yIrSImwgK3Ety5WiE2z GCW2zbzMBFLDKeAq0bdyLtsERsFZSA6dhXDoLCSHLmBkXsUokVqQXFCclJ5rmJdarlecmFtc mpeul5yfu4kRHFXPpHYwHtzlfohRgINRiYf3R1lqhBBrYllxZe4hRgkOZiUR3jTptAgh3pTE yqrUovz4otKc1OJDjKZAr05klhJNzgdGfF5JvKGJuYm5sYGFuaWliZGSOG/j7GfhQgLpiSWp 2ampBalFMH1MHJxSDYym4qVXdkmWZ/St2vImy9mRLcA9cvOF6lf1Zn76XCqyxZMNZ37ZfFF0 xfH7qieyJ1y0fLH/8pSyBbnP4o9OU8rmep7OVp7xJfPEr8YLxdWZXw/ddvpgZZHrdejuqq+C S9/eWVg2fdLyd5pTuQ+eSM7tm1O9YL6hSiFvq8gj8QPFYTLh/XPtfk1QYinOSDTUYi4qTgQA 8yD2y8ACAAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20161230083626epcas1p3f8607d49b12251fbb9a71ff6b857701b X-Msg-Generator: CA X-Sender-IP: 203.254.230.26 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: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-HopCount: 7 X-CMS-RootMailID: 20161230041546epcas5p3e20f537412a173cd3f15de09950cc1ea X-RootMTR: 20161230041546epcas5p3e20f537412a173cd3f15de09950cc1ea References: <1483071340-8559-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 Hi Peter, Please ignore this patch. After posting this patch, I got that this patch was already merged by you. I'm sorry to make the confusion. Regards, Chanwoo Choi On 2016년 12월 30일 13:15, Chanwoo Choi wrote: > 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: Peter Chen > Signed-off-by: Chanwoo Choi > --- > Changes from v1: > - Rebase these patches based on v4.10-rc1. > - Drop the phy/power-supply/dwc3/omap patches. > > drivers/usb/chipidea/core.c | 30 ++++++------------------------ > 1 file changed, 6 insertions(+), 24 deletions(-) > > diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c > index 3dbb4a21ab44..5c35f25e9bce 100644 > --- a/drivers/usb/chipidea/core.c > +++ b/drivers/usb/chipidea/core.c > @@ -742,7 +742,7 @@ static int ci_get_platdata(struct device *dev, > cable->edev = ext_vbus; > > if (!IS_ERR(ext_vbus)) { > - ret = extcon_get_cable_state_(cable->edev, EXTCON_USB); > + ret = extcon_get_state(cable->edev, EXTCON_USB); > if (ret) > cable->state = true; > else > @@ -754,7 +754,7 @@ static int ci_get_platdata(struct device *dev, > cable->edev = ext_id; > > if (!IS_ERR(ext_id)) { > - ret = extcon_get_cable_state_(cable->edev, EXTCON_USB_HOST); > + ret = extcon_get_state(cable->edev, EXTCON_USB_HOST); > if (ret) > cable->state = false; > else > @@ -771,8 +771,8 @@ static int ci_extcon_register(struct ci_hdrc *ci) > id = &ci->platdata->id_extcon; > id->ci = ci; > if (!IS_ERR(id->edev)) { > - ret = extcon_register_notifier(id->edev, EXTCON_USB_HOST, > - &id->nb); > + ret = devm_extcon_register_notifier(ci->dev, id->edev, > + EXTCON_USB_HOST, &id->nb); > if (ret < 0) { > dev_err(ci->dev, "register ID failed\n"); > return ret; > @@ -782,11 +782,9 @@ static int ci_extcon_register(struct ci_hdrc *ci) > vbus = &ci->platdata->vbus_extcon; > vbus->ci = ci; > if (!IS_ERR(vbus->edev)) { > - ret = extcon_register_notifier(vbus->edev, EXTCON_USB, > - &vbus->nb); > + ret = devm_extcon_register_notifier(ci->dev, vbus->edev, > + EXTCON_USB, &vbus->nb); > if (ret < 0) { > - extcon_unregister_notifier(id->edev, EXTCON_USB_HOST, > - &id->nb); > dev_err(ci->dev, "register VBUS failed\n"); > return ret; > } > @@ -795,20 +793,6 @@ static int ci_extcon_register(struct ci_hdrc *ci) > return 0; > } > > -static void ci_extcon_unregister(struct ci_hdrc *ci) > -{ > - struct ci_hdrc_cable *cable; > - > - cable = &ci->platdata->id_extcon; > - if (!IS_ERR(cable->edev)) > - extcon_unregister_notifier(cable->edev, EXTCON_USB_HOST, > - &cable->nb); > - > - cable = &ci->platdata->vbus_extcon; > - if (!IS_ERR(cable->edev)) > - extcon_unregister_notifier(cable->edev, EXTCON_USB, &cable->nb); > -} > - > static DEFINE_IDA(ci_ida); > > struct platform_device *ci_hdrc_add_device(struct device *dev, > @@ -1054,7 +1038,6 @@ static int ci_hdrc_probe(struct platform_device *pdev) > if (!ret) > return 0; > > - ci_extcon_unregister(ci); > stop: > ci_role_destroy(ci); > deinit_phy: > @@ -1074,7 +1057,6 @@ static int ci_hdrc_remove(struct platform_device *pdev) > } > > dbg_remove_files(ci); > - ci_extcon_unregister(ci); > ci_role_destroy(ci); > ci_hdrc_enter_lpm(ci, true); > ci_usb_phy_exit(ci); >