Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752898AbcLFA2A (ORCPT ); Mon, 5 Dec 2016 19:28:00 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:52632 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752576AbcLFA1T (ORCPT ); Mon, 5 Dec 2016 19:27:19 -0500 MIME-version: 1.0 Content-type: text/plain; charset=UTF-8 X-AuditID: cbfee61b-f796f6d000004092-24-584605a8c499 Content-transfer-encoding: 8BIT Message-id: <584605A6.1010803@samsung.com> Date: Tue, 06 Dec 2016 09:26:14 +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: balbi@kernel.org, gregkh@linuxfoundation.org, kishon@ti.com, sre@kernel.org Cc: Peter.Chen@nxp.com, wens@csie.org, yoshihiro.shimoda.uh@renesas.com, maxime.ripard@free-electrons.com, b-liu@ti.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, linux-usb@vger.kernel.org, linux-omap@vger.kernel.org, linux-renesas-soc@vger.kernel.org, chanwoo@kernel.org Subject: Re: [PATCH 03/12] power_supply: axp288_charger: Replace the extcon API References: <1480485460-2663-1-git-send-email-cw00.choi@samsung.com> <1480485460-2663-4-git-send-email-cw00.choi@samsung.com> In-reply-to: <1480485460-2663-4-git-send-email-cw00.choi@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrLIsWRmVeSWpSXmKPExsVy+t9jQd0VrG4RBrPXcFn8v7OI1eJY2xN2 i4k3rrBYNC9ez2Zx4WkPm8Wmx9dYLS7vmsNmMXtJP4vF594jjBZbX75jsli0rJXZYuumvcwW f+7dYbU4vbvE4ueh80wWX/d+ZnMQ8NjwaDWrx5NNFxk9Nq3qZPPYP3cNu8fmJfUeG9/tYPL4 dmYii8fxG9uZPD5vkgvgjHKzyUhNTEktUkjNS85PycxLt1UKDXHTtVBSyEvMTbVVitD1DQlS UihLzCkF8owM0ICDc4B7sJK+XYJbRtuxS0wFS/Ur5kz5ydzAuEK9i5GTQ0LARGL9zW8sELaY xIV769lAbCGBWYwSE/8kgti8AoISPybfA6rh4GAWkJc4cikbJMwsoC4xad4i5i5GLqDyB0Dl k/6wQ9RrSfz8OYcZxGYRUJVYOGspWJwNKL7/xQ2w+fwCihJXfzxmBJkpKhAh0X2iEiQsIuAv saNxDgvITGaB00wSE4/0sYHUCAMlJu8Xgdh1mVGi4+cysPmcAq4Sc+4eZpzAKDgLyamzEE6d heTUBYzMqxglUguSC4qT0nON8lLL9YoTc4tL89L1kvNzNzGCo/6Z9A7Gw7vcDzEKcDAq8fB6 NLtGCLEmlhVX5h5ilOBgVhLh5f8FFOJNSaysSi3Kjy8qzUktPsRoCvTrRGYp0eR8YELKK4k3 NDE3MTc2sDC3tDQxUhLnbZz9LFxIID2xJDU7NbUgtQimj4mDU6qBMTc39GK8t5O5aNe5g/4n QzZtsIvRW7Bng9dS9jVsJte4PBelRZ5p2aq+3jtw9/SwM8oJs7xvnjn3cNn2zE6nJ0Frfpeb Mu5I3Z31rZB557pnz48ztVeeimysjbfT6a2vPLzJYWWHAO/Ruvcf+/3qHrgtne39xu+ioO2d 4Nzzlhwlxi8Y2BcHKLEUZyQaajEXFScCAJfqJO4QAwAA X-MTR: 20000000000000000@CPGS Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5909 Lines: 142 Hi Sebastian, Could you please review and pick the patch3/4 for power-supply driver? Best Regards, Chanwoo Choi On 2016년 11월 30일 14:57, 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() > > Signed-off-by: Chanwoo Choi > --- > drivers/power/supply/axp288_charger.c | 51 +++++++++-------------------------- > 1 file changed, 13 insertions(+), 38 deletions(-) > > diff --git a/drivers/power/supply/axp288_charger.c b/drivers/power/supply/axp288_charger.c > index 75b8e0c7402b..1115052e9a69 100644 > --- a/drivers/power/supply/axp288_charger.c > +++ b/drivers/power/supply/axp288_charger.c > @@ -581,15 +581,15 @@ static void axp288_charger_extcon_evt_worker(struct work_struct *work) > bool old_connected = info->cable.connected; > > /* Determine cable/charger type */ > - if (extcon_get_cable_state_(edev, EXTCON_CHG_USB_SDP) > 0) { > + if (extcon_get_state(edev, EXTCON_CHG_USB_SDP) > 0) { > dev_dbg(&info->pdev->dev, "USB SDP charger is connected"); > info->cable.connected = true; > info->cable.chg_type = POWER_SUPPLY_TYPE_USB; > - } else if (extcon_get_cable_state_(edev, EXTCON_CHG_USB_CDP) > 0) { > + } else if (extcon_get_state(edev, EXTCON_CHG_USB_CDP) > 0) { > dev_dbg(&info->pdev->dev, "USB CDP charger is connected"); > info->cable.connected = true; > info->cable.chg_type = POWER_SUPPLY_TYPE_USB_CDP; > - } else if (extcon_get_cable_state_(edev, EXTCON_CHG_USB_DCP) > 0) { > + } else if (extcon_get_state(edev, EXTCON_CHG_USB_DCP) > 0) { > dev_dbg(&info->pdev->dev, "USB DCP charger is connected"); > info->cable.connected = true; > info->cable.chg_type = POWER_SUPPLY_TYPE_USB_DCP; > @@ -686,7 +686,7 @@ static int axp288_charger_handle_otg_evt(struct notifier_block *nb, > struct axp288_chrg_info *info = > container_of(nb, struct axp288_chrg_info, otg.id_nb); > struct extcon_dev *edev = info->otg.cable; > - int usb_host = extcon_get_cable_state_(edev, EXTCON_USB_HOST); > + int usb_host = extcon_get_state(edev, EXTCON_USB_HOST); > > dev_dbg(&info->pdev->dev, "external connector USB-Host is %s\n", > usb_host ? "attached" : "detached"); > @@ -841,33 +841,27 @@ static int axp288_charger_probe(struct platform_device *pdev) > /* Register for extcon notification */ > INIT_WORK(&info->cable.work, axp288_charger_extcon_evt_worker); > info->cable.nb.notifier_call = axp288_charger_handle_cable_evt; > - ret = extcon_register_notifier(info->cable.edev, EXTCON_CHG_USB_SDP, > - &info->cable.nb); > + ret = devm_extcon_register_notifier(&pdev->dev, info->cable.edev, > + EXTCON_CHG_USB_SDP, &info->cable.nb); > if (ret) { > dev_err(&info->pdev->dev, > "failed to register extcon notifier for SDP %d\n", ret); > return ret; > } > > - ret = extcon_register_notifier(info->cable.edev, EXTCON_CHG_USB_CDP, > - &info->cable.nb); > + ret = devm_extcon_register_notifier(&pdev->dev, info->cable.edev, > + EXTCON_CHG_USB_CDP, &info->cable.nb); > if (ret) { > dev_err(&info->pdev->dev, > "failed to register extcon notifier for CDP %d\n", ret); > - extcon_unregister_notifier(info->cable.edev, > - EXTCON_CHG_USB_SDP, &info->cable.nb); > return ret; > } > > - ret = extcon_register_notifier(info->cable.edev, EXTCON_CHG_USB_DCP, > - &info->cable.nb); > + ret = devm_extcon_register_notifier(&pdev->dev, info->cable.edev, > + EXTCON_CHG_USB_DCP, &info->cable.nb); > if (ret) { > dev_err(&info->pdev->dev, > "failed to register extcon notifier for DCP %d\n", ret); > - extcon_unregister_notifier(info->cable.edev, > - EXTCON_CHG_USB_SDP, &info->cable.nb); > - extcon_unregister_notifier(info->cable.edev, > - EXTCON_CHG_USB_CDP, &info->cable.nb); > return ret; > } > > @@ -887,13 +881,13 @@ static int axp288_charger_probe(struct platform_device *pdev) > /* Register for OTG notification */ > INIT_WORK(&info->otg.work, axp288_charger_otg_evt_worker); > info->otg.id_nb.notifier_call = axp288_charger_handle_otg_evt; > - ret = extcon_register_notifier(info->otg.cable, EXTCON_USB_HOST, > - &info->otg.id_nb); > + ret = devm_extcon_register_notifier(&pdev->dev, info->otg.cable, > + EXTCON_USB_HOST, &info->otg.id_nb); > if (ret) > dev_warn(&pdev->dev, "failed to register otg notifier\n"); > > if (info->otg.cable) > - info->otg.id_short = extcon_get_cable_state_( > + info->otg.id_short = extcon_get_state( > info->otg.cable, EXTCON_USB_HOST); > > /* Register charger interrupts */ > @@ -921,17 +915,8 @@ static int axp288_charger_probe(struct platform_device *pdev) > return 0; > > intr_reg_failed: > - if (info->otg.cable) > - extcon_unregister_notifier(info->otg.cable, EXTCON_USB_HOST, > - &info->otg.id_nb); > power_supply_unregister(info->psy_usb); > psy_reg_failed: > - extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_SDP, > - &info->cable.nb); > - extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_CDP, > - &info->cable.nb); > - extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_DCP, > - &info->cable.nb); > return ret; > } > > @@ -939,16 +924,6 @@ static int axp288_charger_remove(struct platform_device *pdev) > { > struct axp288_chrg_info *info = dev_get_drvdata(&pdev->dev); > > - if (info->otg.cable) > - extcon_unregister_notifier(info->otg.cable, EXTCON_USB_HOST, > - &info->otg.id_nb); > - > - extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_SDP, > - &info->cable.nb); > - extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_CDP, > - &info->cable.nb); > - extcon_unregister_notifier(info->cable.edev, EXTCON_CHG_USB_DCP, > - &info->cable.nb); > power_supply_unregister(info->psy_usb); > > return 0; >