From: Krzysztof Kozlowski <krzysztof.kozlowski@oss•qualcomm.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
"Rafael J. Wysocki" <rafael@kernel•org>,
Danilo Krummrich <dakr@kernel•org>,
Jonathan Corbet <corbet@lwn•net>,
Shuah Khan <skhan@linuxfoundation•org>, Tejun Heo <tj@kernel•org>,
Lai Jiangshan <jiangshanlai@gmail•com>,
Tobias Schrammm <t.schramm@manjaro•org>,
Sebastian Reichel <sre@kernel•org>,
Andy Shevchenko <andriy.shevchenko@linux•intel.com>,
Dan Carpenter <dan.carpenter@linaro•org>,
Krzysztof Kozlowski <krzk@kernel•org>, Lee Jones <lee@kernel•org>,
Dzmitry Sankouski <dsankouski@gmail•com>,
Matthias Brugger <matthias.bgg@gmail•com>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora•com>,
Benson Leung <bleung@chromium•org>,
Tzung-Bi Shih <tzungbi@kernel•org>
Cc: Matti Vaittinen <mazziesaccount@gmail•com>,
driver-core@lists•linux.dev, linux-doc@vger•kernel.org,
linux-kernel@vger•kernel.org,
Sebastian Reichel <sebastian.reichel@collabora•com>,
linux-pm@vger•kernel.org, linux-arm-kernel@lists•infradead.org,
linux-mediatek@lists•infradead.org,
chrome-platform@lists•linux.dev,
Krzysztof Kozlowski <krzysztof.kozlowski@oss•qualcomm.com>
Subject: [PATCH v2 06/10] power: supply: ipaq_micro: Simplify with devm
Date: Thu, 05 Mar 2026 22:45:45 +0100 [thread overview]
Message-ID: <20260305-workqueue-devm-v2-6-66a38741c652@oss.qualcomm.com> (raw)
In-Reply-To: <20260305-workqueue-devm-v2-0-66a38741c652@oss.qualcomm.com>
Simplify the driver by using devm interfaces, which allow to drop
probe() error paths and the remove() callback.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss•qualcomm.com>
---
drivers/power/supply/ipaq_micro_battery.c | 50 ++++++++++---------------------
1 file changed, 16 insertions(+), 34 deletions(-)
diff --git a/drivers/power/supply/ipaq_micro_battery.c b/drivers/power/supply/ipaq_micro_battery.c
index ff8573a5ca6d..5e3fe3852d0e 100644
--- a/drivers/power/supply/ipaq_micro_battery.c
+++ b/drivers/power/supply/ipaq_micro_battery.c
@@ -7,6 +7,7 @@
* Author : Linus Walleij <linus.walleij@linaro•org>
*/
+#include <linux/devm-helpers.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/platform_device.h>
@@ -232,49 +233,31 @@ static int micro_batt_probe(struct platform_device *pdev)
return -ENOMEM;
mb->micro = dev_get_drvdata(pdev->dev.parent);
- mb->wq = alloc_workqueue("ipaq-battery-wq",
- WQ_MEM_RECLAIM | WQ_PERCPU, 0);
+ mb->wq = devm_alloc_workqueue(&pdev->dev, "ipaq-battery-wq",
+ WQ_MEM_RECLAIM | WQ_PERCPU, 0);
if (!mb->wq)
return -ENOMEM;
- INIT_DELAYED_WORK(&mb->update, micro_battery_work);
+ ret = devm_delayed_work_autocancel(&pdev->dev, &mb->update, micro_battery_work);
+ if (ret)
+ return ret;
+
platform_set_drvdata(pdev, mb);
queue_delayed_work(mb->wq, &mb->update, 1);
- micro_batt_power = power_supply_register(&pdev->dev,
- µ_batt_power_desc, NULL);
- if (IS_ERR(micro_batt_power)) {
- ret = PTR_ERR(micro_batt_power);
- goto batt_err;
- }
+ micro_batt_power = devm_power_supply_register(&pdev->dev,
+ µ_batt_power_desc,
+ NULL);
+ if (IS_ERR(micro_batt_power))
+ return PTR_ERR(micro_batt_power);
- micro_ac_power = power_supply_register(&pdev->dev,
- µ_ac_power_desc, NULL);
- if (IS_ERR(micro_ac_power)) {
- ret = PTR_ERR(micro_ac_power);
- goto ac_err;
- }
+ micro_ac_power = devm_power_supply_register(&pdev->dev,
+ µ_ac_power_desc, NULL);
+ if (IS_ERR(micro_ac_power))
+ return PTR_ERR(micro_ac_power);
dev_info(&pdev->dev, "iPAQ micro battery driver\n");
return 0;
-
-ac_err:
- power_supply_unregister(micro_batt_power);
-batt_err:
- cancel_delayed_work_sync(&mb->update);
- destroy_workqueue(mb->wq);
- return ret;
-}
-
-static void micro_batt_remove(struct platform_device *pdev)
-
-{
- struct micro_battery *mb = platform_get_drvdata(pdev);
-
- power_supply_unregister(micro_ac_power);
- power_supply_unregister(micro_batt_power);
- cancel_delayed_work_sync(&mb->update);
- destroy_workqueue(mb->wq);
}
static int __maybe_unused micro_batt_suspend(struct device *dev)
@@ -303,7 +286,6 @@ static struct platform_driver micro_batt_device_driver = {
.pm = µ_batt_dev_pm_ops,
},
.probe = micro_batt_probe,
- .remove = micro_batt_remove,
};
module_platform_driver(micro_batt_device_driver);
--
2.51.0
next prev parent reply other threads:[~2026-03-05 21:46 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-05 21:45 [PATCH v2 00/10] workqueue / drivers: Add device-managed allocate workqueue Krzysztof Kozlowski
2026-03-05 21:45 ` [PATCH v2 01/10] workqueue: devres: " Krzysztof Kozlowski
2026-03-06 4:08 ` Tejun Heo
2026-03-10 9:59 ` Krzysztof Kozlowski
2026-03-10 17:05 ` Tejun Heo
2026-03-05 21:45 ` [PATCH v2 02/10] power: supply: cw2015: Free allocated workqueue Krzysztof Kozlowski
2026-03-05 21:45 ` [PATCH v2 03/10] power: supply: max77705: Drop duplicated IRQ error message Krzysztof Kozlowski
2026-03-05 21:45 ` [PATCH v2 04/10] power: supply: max77705: Free allocated workqueue and fix removal order Krzysztof Kozlowski
2026-03-05 21:45 ` [PATCH v2 05/10] power: supply: mt6370: Simplify with devm_alloc_ordered_workqueue() Krzysztof Kozlowski
2026-03-05 21:45 ` Krzysztof Kozlowski [this message]
2026-03-05 21:45 ` [PATCH v2 07/10] mfd: ezx-pcap: Drop memory allocation error message Krzysztof Kozlowski
2026-03-05 21:45 ` [PATCH v2 08/10] mfd: ezx-pcap: Return directly instead of empty gotos Krzysztof Kozlowski
2026-03-05 21:45 ` [PATCH v2 09/10] mfd: ezx-pcap: Avoid rescheduling after destroying workqueue Krzysztof Kozlowski
2026-03-05 21:45 ` [PATCH v2 10/10] platform/chrome: cros_usbpd_logger: Simplify with devm Krzysztof Kozlowski
2026-03-10 3:26 ` Tzung-Bi Shih
2026-03-06 14:28 ` [PATCH v2 00/10] workqueue / drivers: Add device-managed allocate workqueue Andy Shevchenko
2026-03-11 7:10 ` (subset) " Sebastian Reichel
2026-03-19 16:21 ` Lee Jones
2026-03-20 3:06 ` Tzung-Bi Shih
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=20260305-workqueue-devm-v2-6-66a38741c652@oss.qualcomm.com \
--to=krzysztof.kozlowski@oss$(echo .)qualcomm.com \
--cc=andriy.shevchenko@linux$(echo .)intel.com \
--cc=angelogioacchino.delregno@collabora$(echo .)com \
--cc=bleung@chromium$(echo .)org \
--cc=chrome-platform@lists$(echo .)linux.dev \
--cc=corbet@lwn$(echo .)net \
--cc=dakr@kernel$(echo .)org \
--cc=dan.carpenter@linaro$(echo .)org \
--cc=driver-core@lists$(echo .)linux.dev \
--cc=dsankouski@gmail$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=jiangshanlai@gmail$(echo .)com \
--cc=krzk@kernel$(echo .)org \
--cc=lee@kernel$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-doc@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-mediatek@lists$(echo .)infradead.org \
--cc=linux-pm@vger$(echo .)kernel.org \
--cc=matthias.bgg@gmail$(echo .)com \
--cc=mazziesaccount@gmail$(echo .)com \
--cc=rafael@kernel$(echo .)org \
--cc=sebastian.reichel@collabora$(echo .)com \
--cc=skhan@linuxfoundation$(echo .)org \
--cc=sre@kernel$(echo .)org \
--cc=t.schramm@manjaro$(echo .)org \
--cc=tj@kernel$(echo .)org \
--cc=tzungbi@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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