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=-14.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS 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 6D0AFC433DB for ; Sun, 31 Jan 2021 17:30:35 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 21BB564E28 for ; Sun, 31 Jan 2021 17:30:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 21BB564E28 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=PAmDWke+NwrHpZ6ZjSq/6hMgJhPmnJamy6NciqsVMpw=; b=KbwduN5W4zqRimgPfuOFH5Pai i8VYiYE80wbPBU0TBaTK9AtEU+BzeNHjHTCdwU5dWhRk17kNG5Jj9mDcoAW6f3RPRNQvSbn2+Xn2/ s/dz2hjLScTh5uaOzb5K8HSHTnSF7FLUaZVTvPQFkOsASsScd/vrN1YQneVDGeeeno1iFpZDDghWx 2Ezgx4oRHKpwJLJm67HVbOOzLADT0qeq0ZquQ3O7ZoQtJLDQDFXT18r5D/2lUUy8gxV2Ry2axou5x C+237yUFXKdqXMXarVgxxNX9OFP8M+YMTK2q5GAbu2Kf9ty45tlqgsbveT/e54lcmt0qseIrWr4YW uga4hhM5Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l6GWo-0002Mw-JW; Sun, 31 Jan 2021 17:28:50 +0000 Received: from mail-ej1-f45.google.com ([209.85.218.45]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l6GWm-0002MY-CI for linux-arm-kernel@lists.infradead.org; Sun, 31 Jan 2021 17:28:49 +0000 Received: by mail-ej1-f45.google.com with SMTP id r12so20662413ejb.9 for ; Sun, 31 Jan 2021 09:28:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Gd1kwiYZVZqHxGZ4QrLOcLWC/Yc7tIB41MFJH1DjrOE=; b=lcyBWXN63bnIDMH450sBOxbiwG5bL0tuboNAkEgP1rs//YBco07LsQH48sD+3G7WSe 4u4BNuBFlE97tJVKLeRg7aRgo3PhBGwwWumnWb9QE0wMx7U2olr3K6RR9vxUc6kl0DvU 6ow8OhmsWQ4GhgreO2H3FuTW/gYeCl7o2o6FoRTjxtzzGyI0CMab0gRgCuzD5i214l5K xC+Rkt3VH080tCWBmzCUNprxwJkPKRuAGoE23570yM6Wf0r/GLyjQZqugP9UZuP5fqCl 9e2vUWlEvdFPVTXO2Wtr/8+i78UjFMYFeQ9YJOnv6WteAepuF3fOuvBBt1L71smIrPZ7 4JwA== X-Gm-Message-State: AOAM533cLvz92twVFPHn8bklMQLvX5Ns/J0sXgBJKAJSo0xqX2i/ageR fkw5nGVRfrwpU4/xcFvCQz0= X-Google-Smtp-Source: ABdhPJz+pSN0UgQq9d30A0QB6sxrw8CN2kA2ipY6zlnjIn+rBf6kLJaK1Mc4wolK/V1jCHU+t7Yg1w== X-Received: by 2002:a17:906:f144:: with SMTP id gw4mr14257685ejb.189.1612114123011; Sun, 31 Jan 2021 09:28:43 -0800 (PST) Received: from kozik-lap (adsl-84-226-167-205.adslplus.ch. [84.226.167.205]) by smtp.googlemail.com with ESMTPSA id u23sm7486937edt.87.2021.01.31.09.28.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 09:28:41 -0800 (PST) Date: Sun, 31 Jan 2021 18:28:40 +0100 From: Krzysztof Kozlowski To: Timon Baetz Subject: Re: [PATCH 3/3] power: supply: max8997_charger: Switch to new binding Message-ID: <20210131172840.fxaadhhsafa4aeex@kozik-lap> References: <20210130172747.2022977-1-timon.baetz@protonmail.com> <20210130172747.2022977-4-timon.baetz@protonmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210130172747.2022977-4-timon.baetz@protonmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210131_122848_482720_EFAC5136 X-CRM114-Status: GOOD ( 18.98 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , Liam Girdwood , Mark Brown , Sebastian Reichel , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Sat, Jan 30, 2021 at 05:30:14PM +0000, Timon Baetz wrote: > Get regulator from parent device's node and extcon by name. > > Signed-off-by: Timon Baetz > --- > drivers/power/supply/max8997_charger.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/power/supply/max8997_charger.c b/drivers/power/supply/max8997_charger.c > index 321bd6b8ee41..625d8cc4312a 100644 > --- a/drivers/power/supply/max8997_charger.c > +++ b/drivers/power/supply/max8997_charger.c > @@ -168,6 +168,7 @@ static int max8997_battery_probe(struct platform_device *pdev) > int ret = 0; > struct charger_data *charger; > struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent); > + struct device_node *np = pdev->dev.of_node; > struct i2c_client *i2c = iodev->i2c; > struct max8997_platform_data *pdata = iodev->pdata; > struct power_supply_config psy_cfg = {}; > @@ -237,20 +238,23 @@ static int max8997_battery_probe(struct platform_device *pdev) > return PTR_ERR(charger->battery); > } > > + // grab regulator from parent device's node > + pdev->dev.of_node = iodev->dev->of_node; > charger->reg = devm_regulator_get_optional(&pdev->dev, "charger"); > + pdev->dev.of_node = np; I think the device does not have its own node anymore. Or did I miss something? > if (IS_ERR(charger->reg)) { > if (PTR_ERR(charger->reg) == -EPROBE_DEFER) > return -EPROBE_DEFER; > dev_info(&pdev->dev, "couldn't get charger regulator\n"); > } > - charger->edev = extcon_get_edev_by_phandle(&pdev->dev, 0); > - if (IS_ERR(charger->edev)) { > - if (PTR_ERR(charger->edev) == -EPROBE_DEFER) > + charger->edev = extcon_get_extcon_dev("max8997-muic"); > + if (IS_ERR_OR_NULL(charger->edev)) { > + if (!charger->edev) Isn't NULL returned when there is simply no extcon? It's different than deferred probe. Returning here EPROBE_DEFER might lead to infinite probe tries (on every new device probe) instead of just failing it. Best regards, Krzysztof > return -EPROBE_DEFER; > dev_info(charger->dev, "couldn't get extcon device\n"); > } > > - if (!IS_ERR(charger->reg) && !IS_ERR(charger->edev)) { > + if (!IS_ERR(charger->reg) && !IS_ERR_OR_NULL(charger->edev)) { > INIT_WORK(&charger->extcon_work, max8997_battery_extcon_evt_worker); > ret = devm_add_action(&pdev->dev, max8997_battery_extcon_evt_stop_work, charger); > if (ret) { > -- > 2.25.1 > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel