From: cw00.choi@samsung•com (Chanwoo Choi)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 03/12] power_supply: axp288_charger: Replace the extcon API
Date: Tue, 06 Dec 2016 09:26:14 +0900 [thread overview]
Message-ID: <584605A6.1010803@samsung.com> (raw)
In-Reply-To: <1480485460-2663-4-git-send-email-cw00.choi@samsung.com>
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 <cw00.choi@samsung•com>
> ---
> 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;
>
next prev parent reply other threads:[~2016-12-06 0:26 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-30 5:57 [PATCH 00/12] extcon: Replace the deprecated extcon API Chanwoo Choi
2016-11-30 5:57 ` [PATCH 01/12] phy: rcar-gen3-usb2: " Chanwoo Choi
2016-12-06 0:25 ` Chanwoo Choi
2016-12-06 1:35 ` Yoshihiro Shimoda
2016-11-30 5:57 ` [PATCH 02/12] phy: sun4i-usb: " Chanwoo Choi
2016-11-30 5:57 ` [PATCH 03/12] power_supply: axp288_charger: Replace the " Chanwoo Choi
2016-12-06 0:26 ` Chanwoo Choi [this message]
2016-12-07 3:05 ` Sebastian Reichel
2016-12-07 3:45 ` Chanwoo Choi
2016-11-30 5:57 ` [PATCH 04/12] power_supply: qcom_smbb: Replace the deprecated " Chanwoo Choi
2016-11-30 5:57 ` [PATCH 05/12] usb: chipdata: Replace the " Chanwoo Choi
2016-12-02 6:59 ` Peter Chen
2016-11-30 5:57 ` [PATCH 06/12] usb: dwc3: omap: " Chanwoo Choi
2016-11-30 10:36 ` Felipe Balbi
2016-12-02 7:52 ` Chanwoo Choi
2016-12-02 9:03 ` Felipe Balbi
2016-12-02 13:20 ` Chanwoo Choi
2016-12-30 2:46 ` Chanwoo Choi
2016-12-30 6:45 ` Chanwoo Choi
2016-11-30 5:57 ` [PATCH 07/12] usb: sunxi: Uses the resource-managed extcon API when registering extcon notifier Chanwoo Choi
2016-11-30 8:45 ` Maxime Ripard
2016-12-05 16:32 ` Bin Liu
2016-12-06 0:21 ` Chanwoo Choi
2016-11-30 5:57 ` [PATCH 08/12] usb: phy: msm: Replace the extcon API Chanwoo Choi
2016-11-30 10:40 ` Felipe Balbi
2016-11-30 5:57 ` [PATCH 09/12] usb: phy: omap-otg: " Chanwoo Choi
2016-11-30 10:41 ` Felipe Balbi
2016-11-30 5:57 ` [PATCH 10/12] usb: phy: qcom-8x16-usb: " Chanwoo Choi
2016-11-30 10:42 ` Felipe Balbi
2016-11-30 5:57 ` [PATCH 11/12] usb: phy: tahvo: Replace the deprecated " Chanwoo Choi
2016-11-30 10:42 ` Felipe Balbi
2016-11-30 5:57 ` [PATCH 12/12] usb: renesas_usbhs: " Chanwoo Choi
2016-11-30 10:43 ` Felipe Balbi
2016-12-06 1:35 ` Yoshihiro Shimoda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=584605A6.1010803@samsung.com \
--to=cw00.choi@samsung$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox