From: Sebastian Reichel <sre@kernel.org>
To: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Cc: Matti Vaittinen <mazziesaccount@gmail.com>,
Hans de Goede <hdegoede@redhat.com>,
MyungJoo Ham <myungjoo.ham@samsung.com>,
Chanwoo Choi <cw00.choi@samsung.com>,
Chen-Yu Tsai <wens@csie.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org
Subject: Re: [PATCH 2/2] power: supply: axp20x_usb_power: fix work-queue init
Date: Wed, 24 Mar 2021 11:25:06 +0100 [thread overview]
Message-ID: <20210324102506.3ta2zstmrwq4wswb@earth.universe> (raw)
In-Reply-To: <a774ca25010b7c932c07f22ce8a548466705c023.1616574973.git.matti.vaittinen@fi.rohmeurope.com>
[-- Attachment #1: Type: text/plain, Size: 2501 bytes --]
Hi,
On Wed, Mar 24, 2021 at 11:21:34AM +0200, Matti Vaittinen wrote:
> The commit 6d0c5de2fd84
> ("power: supply: Clean-up few drivers by using managed work init")
> Re-introduced wrong order of initializing work-queue and requesting
> the IRQs which was originally fixed by the commit b5e8642ed95f
> ("power: supply: axp20x_usb_power: Init work before enabling IRQs")
>
> In addition this caused the work queue to be initialized twice.
>
> Fix it again.
>
> Fixes: 6d0c5de2fd84 ("power: supply: Clean-up few drivers by using managed work init")
>
> Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
> Reported-by: Chen-Yu Tsai <wens@csie.org>
> ---
Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Needs to be merged by Greg, since I do not have 6d0c5de2fd84 in
my tree.
-- Sebastian
> drivers/power/supply/axp20x_usb_power.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/power/supply/axp20x_usb_power.c b/drivers/power/supply/axp20x_usb_power.c
> index 4259709e3491..e954970b50e6 100644
> --- a/drivers/power/supply/axp20x_usb_power.c
> +++ b/drivers/power/supply/axp20x_usb_power.c
> @@ -594,7 +594,11 @@ static int axp20x_usb_power_probe(struct platform_device *pdev)
> power->axp20x_id = axp_data->axp20x_id;
> power->regmap = axp20x->regmap;
> power->num_irqs = axp_data->num_irq_names;
> - INIT_DELAYED_WORK(&power->vbus_detect, axp20x_usb_power_poll_vbus);
> +
> + ret = devm_delayed_work_autocancel(&pdev->dev, &power->vbus_detect,
> + axp20x_usb_power_poll_vbus);
> + if (ret)
> + return ret;
>
> if (power->axp20x_id == AXP202_ID) {
> /* Enable vbus valid checking */
> @@ -647,10 +651,6 @@ static int axp20x_usb_power_probe(struct platform_device *pdev)
> }
> }
>
> - ret = devm_delayed_work_autocancel(&pdev->dev, &power->vbus_detect,
> - axp20x_usb_power_poll_vbus);
> - if (ret)
> - return ret;
> if (axp20x_usb_vbus_needs_polling(power))
> queue_delayed_work(system_power_efficient_wq, &power->vbus_detect, 0);
>
> --
> 2.25.4
>
>
> --
> Matti Vaittinen, Linux device drivers
> ROHM Semiconductors, Finland SWDC
> Kiviharjunlenkki 1E
> 90220 OULU
> FINLAND
>
> ~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~
> Simon says - in Latin please.
> ~~~ "non cogito me" dixit Rene Descarte, deinde evanescavit ~~~
> Thanks to Simon Glass for the translation =]
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2021-03-24 10:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-24 9:20 [PATCH 0/2] Fixes to device-managed work-queue series Matti Vaittinen
2021-03-24 9:21 ` [PATCH 1/2] extcon: extcon-gpio: Log error if work-queue init fails Matti Vaittinen
2021-03-24 9:25 ` Hans de Goede
2021-03-24 9:51 ` Vaittinen, Matti
2021-03-25 0:49 ` Chanwoo Choi
2021-03-25 4:52 ` Vaittinen, Matti
2021-03-25 14:01 ` gregkh
2021-03-24 9:21 ` [PATCH 2/2] power: supply: axp20x_usb_power: fix work-queue init Matti Vaittinen
2021-03-24 10:25 ` Sebastian Reichel [this message]
2021-03-26 14:48 ` Greg Kroah-Hartman
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=20210324102506.3ta2zstmrwq4wswb@earth.universe \
--to=sre@kernel.org \
--cc=cw00.choi@samsung.com \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=matti.vaittinen@fi.rohmeurope.com \
--cc=mazziesaccount@gmail.com \
--cc=myungjoo.ham@samsung.com \
--cc=wens@csie.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).