From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB336C43441 for ; Fri, 16 Nov 2018 11:02:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8B6B42089D for ; Fri, 16 Nov 2018 11:02:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linaro.org header.i=@linaro.org header.b="R0QhzbVv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8B6B42089D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389613AbeKPVOF (ORCPT ); Fri, 16 Nov 2018 16:14:05 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:40326 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389582AbeKPVOF (ORCPT ); Fri, 16 Nov 2018 16:14:05 -0500 Received: by mail-pf1-f193.google.com with SMTP id x2-v6so11245865pfm.7 for ; Fri, 16 Nov 2018 03:02:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=oFvCzZZqNBSbDG9EOSs0H2fQO9rLPB9US33Ar8fKAkM=; b=R0QhzbVvE26Vzwv072oDm8R9rLKqth6qj0b3qrBuv9NlCudvzF0mmxvQx/ZAvuPQDr Q0mMTxVsV62Eo18dZA7NYVFq16oNuJaYaFzb1nGb6sNfHRUrrhu1Z/3bhxa7OSyOcvXc /SjgRJvcZxdBvRUXqUpUt+UGRcGLLGN/cUeq4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=oFvCzZZqNBSbDG9EOSs0H2fQO9rLPB9US33Ar8fKAkM=; b=KjOBj3A6r+38m1RVZz9tl1PB268bDNXY5AbPwPLxbJMyxQXY5J9qHArSxiX3m7w4z5 hQhswq99Kr6q+NYDAsAG7F2l7uu+kA7CRt8+IqpHVrZ5g2ITP8vM7bEEdf28IMqzhOXh TDRp8DRoDMelPK3/WVM677zWT6Pe+Ee+011MiFcsoPibBo6q2kbozjNST0k/fmenvM6a o/huwEuFk6VmWMIZlOg8Vkn54PBxVSDdUK4/7dsUxeKrk1ldiQuXLfMaD0mZASx6B2qY iUShw8oRlEByE7X1kZbRsILeh6kBedQMUzi5iBo4nQsVWV4mKAAq3fW3sgeOdkECAOIp fWIg== X-Gm-Message-State: AGRZ1gLTC8gVgLqrwyg5E73fmOYh9ybc1ubFAFtCW7E0vDS+YJw8W3M4 llycL99UCwUBRn1/8MQztrl0Fw== X-Google-Smtp-Source: AJdET5drnHPO+jP85ybSrULjCoRx34i4F5ifG0RLEX3gbm6IhCRzRgJt1fHT9KMzcZBxKGVD4P/COA== X-Received: by 2002:a63:e445:: with SMTP id i5mr9466026pgk.307.1542366134115; Fri, 16 Nov 2018 03:02:14 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id 202sm21268106pfy.87.2018.11.16.03.02.09 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Nov 2018 03:02:13 -0800 (PST) From: Baolin Wang To: sre@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com Cc: linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, yuanjiang.yu@unisoc.com, baolin.wang@linaro.org, broonie@kernel.org, linus.walleij@linaro.org Subject: [PATCH 5/6] power: supply: charger-manager: Remove deprecated extcon APIs Date: Fri, 16 Nov 2018 19:01:12 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <4ea9eaf85d780afb190cb45da2df8ff5fd86d449.1542362262.git.baolin.wang@linaro.org> References: <4ea9eaf85d780afb190cb45da2df8ff5fd86d449.1542362262.git.baolin.wang@linaro.org> In-Reply-To: <4ea9eaf85d780afb190cb45da2df8ff5fd86d449.1542362262.git.baolin.wang@linaro.org> References: <4ea9eaf85d780afb190cb45da2df8ff5fd86d449.1542362262.git.baolin.wang@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The struct extcon_specific_cable_nb and related APIs are deprecated now, so we should use new method to get one extcon device and register extcon notifier. Signed-off-by: Baolin Wang --- .../bindings/power/supply/charger-manager.txt | 6 +-- drivers/power/supply/charger-manager.c | 51 ++++++++------------ include/linux/power/charger-manager.h | 2 +- 3 files changed, 23 insertions(+), 36 deletions(-) diff --git a/Documentation/devicetree/bindings/power/supply/charger-manager.txt b/Documentation/devicetree/bindings/power/supply/charger-manager.txt index ec4fe9d..315b0cb 100644 --- a/Documentation/devicetree/bindings/power/supply/charger-manager.txt +++ b/Documentation/devicetree/bindings/power/supply/charger-manager.txt @@ -11,7 +11,7 @@ Required properties : - cm-regulator-name : name of charger regulator - subnode : - cm-cable-name : name of charger cable - - cm-cable-extcon : name of extcon dev + - extcon : phandles to external connector devices (optional) - cm-cable-min : minimum current of cable (optional) - cm-cable-max : maximum current of cable @@ -66,13 +66,13 @@ Example : cm-regulator-name = "chg-reg"; cable@0 { cm-cable-name = "USB"; - cm-cable-extcon = "extcon-dev.0"; + extcon = <&extcon_usb>; cm-cable-min = <475000>; cm-cable-max = <500000>; }; cable@1 { cm-cable-name = "TA"; - cm-cable-extcon = "extcon-dev.0"; + extcon = <&extcon_usb>; cm-cable-min = <650000>; cm-cable-max = <675000>; }; diff --git a/drivers/power/supply/charger-manager.c b/drivers/power/supply/charger-manager.c index dc0c9a6..4f28c03 100644 --- a/drivers/power/supply/charger-manager.c +++ b/drivers/power/supply/charger-manager.c @@ -1207,12 +1207,11 @@ static int charger_extcon_init(struct charger_manager *cm, */ INIT_WORK(&cable->wq, charger_extcon_work); cable->nb.notifier_call = charger_extcon_notifier; - ret = extcon_register_interest(&cable->extcon_dev, - cable->extcon_name, cable->name, &cable->nb); - if (ret < 0) { - pr_info("Cannot register extcon_dev for %s(cable: %s)\n", - cable->extcon_name, cable->name); - } + ret = devm_extcon_register_notifier(cm->dev, cable->extcon_dev, + EXTCON_USB, &cable->nb); + if (ret < 0) + dev_err(cm->dev, "Cannot register extcon_dev for (cable: %s)\n", + cable->name); return ret; } @@ -1589,15 +1588,25 @@ static struct charger_desc *of_cm_parse_desc(struct device *dev) for_each_child_of_node(child, _child) { of_property_read_string(_child, "cm-cable-name", &cables->name); - of_property_read_string(_child, - "cm-cable-extcon", - &cables->extcon_name); of_property_read_u32(_child, "cm-cable-min", &cables->min_uA); of_property_read_u32(_child, "cm-cable-max", &cables->max_uA); + + if (of_property_read_bool(_child, "extcon")) { + struct device_node *np; + + np = of_parse_phandle(_child, "extcon", 0); + if (!np) + return ERR_PTR(-ENODEV); + + cables->extcon_dev = extcon_find_edev_by_node(np); + of_node_put(np); + if (IS_ERR(cables->extcon_dev)) + return ERR_PTR(PTR_ERR(cables->extcon_dev)); + } cables++; } } @@ -1625,7 +1634,6 @@ static int charger_manager_probe(struct platform_device *pdev) struct charger_desc *desc = cm_get_drv_data(pdev); struct charger_manager *cm; int ret, i = 0; - int j = 0; union power_supply_propval val; struct power_supply *fuel_gauge; struct power_supply_config psy_cfg = {}; @@ -1823,19 +1831,8 @@ static int charger_manager_probe(struct platform_device *pdev) &charger->attr_g); } err_reg_extcon: - for (i = 0; i < desc->num_charger_regulators; i++) { - struct charger_regulator *charger; - - charger = &desc->charger_regulators[i]; - for (j = 0; j < charger->num_cables; j++) { - struct charger_cable *cable = &charger->cables[j]; - /* Remove notifier block if only edev exists */ - if (cable->extcon_dev.edev) - extcon_unregister_interest(&cable->extcon_dev); - } - + for (i = 0; i < desc->num_charger_regulators; i++) regulator_put(desc->charger_regulators[i].consumer); - } power_supply_unregister(cm->charger_psy); @@ -1847,7 +1844,6 @@ static int charger_manager_remove(struct platform_device *pdev) struct charger_manager *cm = platform_get_drvdata(pdev); struct charger_desc *desc = cm->desc; int i = 0; - int j = 0; /* Remove from the list */ mutex_lock(&cm_list_mtx); @@ -1857,15 +1853,6 @@ static int charger_manager_remove(struct platform_device *pdev) cancel_work_sync(&setup_polling); cancel_delayed_work_sync(&cm_monitor_work); - for (i = 0 ; i < desc->num_charger_regulators ; i++) { - struct charger_regulator *charger - = &desc->charger_regulators[i]; - for (j = 0 ; j < charger->num_cables ; j++) { - struct charger_cable *cable = &charger->cables[j]; - extcon_unregister_interest(&cable->extcon_dev); - } - } - for (i = 0 ; i < desc->num_charger_regulators ; i++) regulator_put(desc->charger_regulators[i].consumer); diff --git a/include/linux/power/charger-manager.h b/include/linux/power/charger-manager.h index c4fa907..e4d0269 100644 --- a/include/linux/power/charger-manager.h +++ b/include/linux/power/charger-manager.h @@ -66,7 +66,7 @@ struct charger_cable { const char *name; /* The charger-manager use Extcon framework */ - struct extcon_specific_cable_nb extcon_dev; + struct extcon_dev *extcon_dev; struct work_struct wq; struct notifier_block nb; -- 1.7.9.5