From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753066AbdDMLtY (ORCPT ); Thu, 13 Apr 2017 07:49:24 -0400 Received: from fllnx209.ext.ti.com ([198.47.19.16]:63957 "EHLO fllnx209.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752612AbdDMLtW (ORCPT ); Thu, 13 Apr 2017 07:49:22 -0400 Subject: Re: [PATCH 2/2] phy: rockchip-inno-usb2: Replace the extcon API To: Chanwoo Choi References: <1490675909-2533-1-git-send-email-cw00.choi@samsung.com> <1490675909-2533-2-git-send-email-cw00.choi@samsung.com> CC: , , , Heiko Stuebner , From: Kishon Vijay Abraham I Message-ID: <357e4565-e1df-2ccb-f2fa-369417061952@ti.com> Date: Thu, 13 Apr 2017 17:17:47 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <1490675909-2533-2-git-send-email-cw00.choi@samsung.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tuesday 28 March 2017 10:08 AM, 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() > - extcon_set_cable_state_() -> extcon_set_state_sync() > > Cc: Kishon Vijay Abraham I > Cc: Heiko Stuebner > Cc: linux-rockchip@lists.infradead.org > Signed-off-by: Chanwoo Choi for this too: Acked-by: Kishon Vijay Abraham I > --- > drivers/phy/phy-rockchip-inno-usb2.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/phy/phy-rockchip-inno-usb2.c b/drivers/phy/phy-rockchip-inno-usb2.c > index 4ea95c28a66f..02751f70067e 100644 > --- a/drivers/phy/phy-rockchip-inno-usb2.c > +++ b/drivers/phy/phy-rockchip-inno-usb2.c > @@ -540,7 +540,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); > @@ -596,7 +596,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, > @@ -617,7 +617,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); > @@ -1003,8 +1003,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"); > } >