From: Sebastian Reichel <sre@kernel.org>
To: Stephen Boyd <swboyd@chromium.org>
Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
kernel-team@android.com,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Tri Vo <trong@android.com>, Kalesh Singh <kaleshsingh@google.com>,
Ravi Chandra Sadineni <ravisadineni@chromium.org>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Viresh Kumar <viresh.kumar@linaro.org>
Subject: Re: [PATCH] power: supply: Init device wakeup after device_add()
Date: Mon, 2 Sep 2019 10:00:43 +0200 [thread overview]
Message-ID: <20190902080043.nx7rqf32fv7w6eoy@earth.universe> (raw)
In-Reply-To: <20190801213330.81079-1-swboyd@chromium.org>
[-- Attachment #1: Type: text/plain, Size: 2707 bytes --]
Hi,
On Thu, Aug 01, 2019 at 02:33:30PM -0700, 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 <gregkh@linuxfoundation.org>
> Cc: Tri Vo <trong@android.com>
> Cc: Kalesh Singh <kaleshsingh@google.com>
> Cc: Ravi Chandra Sadineni <ravisadineni@chromium.org>
> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> Cc: Viresh Kumar <viresh.kumar@linaro.org>
> Signed-off-by: Stephen Boyd <swboyd@chromium.org>
> ---
Thanks, queued.
-- Sebastian
>
> 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);
> --
> Sent by a computer through tubes
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
prev parent reply other threads:[~2019-09-02 8:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-01 21:33 [PATCH] power: supply: Init device wakeup after device_add() Stephen Boyd
2019-08-02 9:49 ` Rafael J. Wysocki
2019-09-02 8:00 ` Sebastian Reichel [this message]
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=20190902080043.nx7rqf32fv7w6eoy@earth.universe \
--to=sre@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=kaleshsingh@google.com \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=ravisadineni@chromium.org \
--cc=rjw@rjwysocki.net \
--cc=swboyd@chromium.org \
--cc=trong@android.com \
--cc=viresh.kumar@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).