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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable 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 6B4EAC32753 for ; Fri, 2 Aug 2019 09:49:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4B5D4206A2 for ; Fri, 2 Aug 2019 09:49:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405149AbfHBJt1 (ORCPT ); Fri, 2 Aug 2019 05:49:27 -0400 Received: from cloudserver094114.home.pl ([79.96.170.134]:64240 "EHLO cloudserver094114.home.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405137AbfHBJt0 (ORCPT ); Fri, 2 Aug 2019 05:49:26 -0400 Received: from 79.184.255.110.ipv4.supernova.orange.pl (79.184.255.110) (HELO kreacher.localnet) by serwer1319399.home.pl (79.96.170.134) with SMTP (IdeaSmtpServer 0.83.275) id e1982bc9eb5b63f9; Fri, 2 Aug 2019 11:49:24 +0200 From: "Rafael J. Wysocki" To: Stephen Boyd Cc: Sebastian Reichel , linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, kernel-team@android.com, Greg Kroah-Hartman , Tri Vo , Kalesh Singh , Ravi Chandra Sadineni , Viresh Kumar Subject: Re: [PATCH] power: supply: Init device wakeup after device_add() Date: Fri, 02 Aug 2019 11:49:24 +0200 Message-ID: <5888477.sfNfyo0UZj@kreacher> In-Reply-To: <20190801213330.81079-1-swboyd@chromium.org> References: <20190801213330.81079-1-swboyd@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org On Thursday, August 1, 2019 11:33:30 PM CEST Stephen Boyd wrote: > We may want to use the device pointer in device_init_wakeup() with > functions that expect the device to already be added with device_add(). > For example, if we were to link the device initializing wakeup to > something in sysfs such as a class for wakeups we'll run into an error. > It looks like this code was written with the assumption that the device > would be added before initializing wakeup due to the order of operations > in power_supply_unregister(). > > Let's change the order of operations so we don't run into problems here. > > Fixes: 948dcf966228 ("power_supply: Prevent suspend until power supply events are processed") > Cc: Greg Kroah-Hartman > Cc: Tri Vo > Cc: Kalesh Singh > Cc: Ravi Chandra Sadineni > Cc: "Rafael J. Wysocki" > Cc: Viresh Kumar > Signed-off-by: Stephen Boyd > --- > > See this thread[1] for more information on how this will be necessary. > > [1] https://lkml.kernel.org/r/20190731215514.212215-1-trong@android.com > > > drivers/power/supply/power_supply_core.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c > index 82e84801264c..5c36c430ce8b 100644 > --- a/drivers/power/supply/power_supply_core.c > +++ b/drivers/power/supply/power_supply_core.c > @@ -1051,14 +1051,14 @@ __power_supply_register(struct device *parent, > } > > spin_lock_init(&psy->changed_lock); > - rc = device_init_wakeup(dev, ws); > - if (rc) > - goto wakeup_init_failed; > - > rc = device_add(dev); > if (rc) > goto device_add_failed; > > + rc = device_init_wakeup(dev, ws); > + if (rc) > + goto wakeup_init_failed; > + > rc = psy_register_thermal(psy); > if (rc) > goto register_thermal_failed; > @@ -1101,8 +1101,8 @@ __power_supply_register(struct device *parent, > psy_unregister_thermal(psy); > register_thermal_failed: > device_del(dev); > -device_add_failed: > wakeup_init_failed: > +device_add_failed: > check_supplies_failed: > dev_set_name_failed: > put_device(dev); > Acked-by: Rafael J. Wysocki