| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20210309134637.j3ffbmt54f5eabfq@earth.universe>
Date: Tue, 9 Mar 2021 14:46:37 +0100
From: Sebastian Reichel <sebastian.reichel@...labora.com>
To: Matti Vaittinen <matti.vaittinen@...rohmeurope.com>
Cc: mazziesaccount@...il.com, Hans de Goede <hdegoede@...hat.com>,
Chen-Yu Tsai <wens@...e.org>, gregkh@...uxfoundation.org,
linux-kernel@...r.kernel.org, linux-pm@...r.kernel.org
Subject: Re: [RFC PATCH v2 6/8] power: supply: Clean-up few drivers by using
managed work init
Hi,
On Mon, Mar 08, 2021 at 10:42:43AM +0200, Matti Vaittinen wrote:
> Few drivers implement remove call-back only for ensuring a delayed
> work gets cancelled prior driver removal. Clean-up these by switching
> to use devm_delayed_work_autocancel() instead.
>
> This change is compile-tested only. All testing is appreciated.
>
> Signed-off-by: Matti Vaittinen <matti.vaittinen@...rohmeurope.com>
> ---
LGTM. This looks like it might result in merge conflicts when being
applied to another tree, so I need an immutable branch.
Acked-by: Sebastian Reichel <sebastian.reichel@...labora.com>
-- Sebastian
> drivers/power/supply/axp20x_usb_power.c | 15 +++++----------
> drivers/power/supply/bq24735-charger.c | 18 ++++++------------
> drivers/power/supply/ltc2941-battery-gauge.c | 20 +++++++-------------
> drivers/power/supply/sbs-battery.c | 16 +++++-----------
> 4 files changed, 23 insertions(+), 46 deletions(-)
>
> diff --git a/drivers/power/supply/axp20x_usb_power.c b/drivers/power/supply/axp20x_usb_power.c
> index 8933ae26c3d6..4259709e3491 100644
> --- a/drivers/power/supply/axp20x_usb_power.c
> +++ b/drivers/power/supply/axp20x_usb_power.c
> @@ -8,6 +8,7 @@
>
> #include <linux/bitops.h>
> #include <linux/device.h>
> +#include <linux/devm-helpers.h>
> #include <linux/init.h>
> #include <linux/interrupt.h>
> #include <linux/kernel.h>
> @@ -646,21 +647,16 @@ 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);
>
> return 0;
> }
>
> -static int axp20x_usb_power_remove(struct platform_device *pdev)
> -{
> - struct axp20x_usb_power *power = platform_get_drvdata(pdev);
> -
> - cancel_delayed_work_sync(&power->vbus_detect);
> -
> - return 0;
> -}
> -
> static const struct of_device_id axp20x_usb_power_match[] = {
> {
> .compatible = "x-powers,axp202-usb-power-supply",
> @@ -680,7 +676,6 @@ MODULE_DEVICE_TABLE(of, axp20x_usb_power_match);
>
> static struct platform_driver axp20x_usb_power_driver = {
> .probe = axp20x_usb_power_probe,
> - .remove = axp20x_usb_power_remove,
> .driver = {
> .name = DRVNAME,
> .of_match_table = axp20x_usb_power_match,
> diff --git a/drivers/power/supply/bq24735-charger.c b/drivers/power/supply/bq24735-charger.c
> index ab2f4bf8f603..b5d619db79f6 100644
> --- a/drivers/power/supply/bq24735-charger.c
> +++ b/drivers/power/supply/bq24735-charger.c
> @@ -17,6 +17,7 @@
> * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
> */
>
> +#include <linux/devm-helpers.h>
> #include <linux/err.h>
> #include <linux/i2c.h>
> #include <linux/init.h>
> @@ -473,7 +474,11 @@ static int bq24735_charger_probe(struct i2c_client *client,
> if (!charger->poll_interval)
> return 0;
>
> - INIT_DELAYED_WORK(&charger->poll, bq24735_poll);
> + ret = devm_delayed_work_autocancel(&client->dev, &charger->poll,
> + bq24735_poll);
> + if (ret)
> + return ret;
> +
> schedule_delayed_work(&charger->poll,
> msecs_to_jiffies(charger->poll_interval));
> }
> @@ -481,16 +486,6 @@ static int bq24735_charger_probe(struct i2c_client *client,
> return 0;
> }
>
> -static int bq24735_charger_remove(struct i2c_client *client)
> -{
> - struct bq24735 *charger = i2c_get_clientdata(client);
> -
> - if (charger->poll_interval)
> - cancel_delayed_work_sync(&charger->poll);
> -
> - return 0;
> -}
> -
> static const struct i2c_device_id bq24735_charger_id[] = {
> { "bq24735-charger", 0 },
> {}
> @@ -509,7 +504,6 @@ static struct i2c_driver bq24735_charger_driver = {
> .of_match_table = bq24735_match_ids,
> },
> .probe = bq24735_charger_probe,
> - .remove = bq24735_charger_remove,
> .id_table = bq24735_charger_id,
> };
>
> diff --git a/drivers/power/supply/ltc2941-battery-gauge.c b/drivers/power/supply/ltc2941-battery-gauge.c
> index 10cd617516ec..09f3e78af4e0 100644
> --- a/drivers/power/supply/ltc2941-battery-gauge.c
> +++ b/drivers/power/supply/ltc2941-battery-gauge.c
> @@ -8,6 +8,7 @@
> * Author: Auryn Verwegen
> * Author: Mike Looijmans
> */
> +#include <linux/devm-helpers.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/of_device.h>
> @@ -445,15 +446,6 @@ static enum power_supply_property ltc294x_properties[] = {
> POWER_SUPPLY_PROP_CURRENT_NOW,
> };
>
> -static int ltc294x_i2c_remove(struct i2c_client *client)
> -{
> - struct ltc294x_info *info = i2c_get_clientdata(client);
> -
> - cancel_delayed_work_sync(&info->work);
> - power_supply_unregister(info->supply);
> - return 0;
> -}
> -
> static int ltc294x_i2c_probe(struct i2c_client *client,
> const struct i2c_device_id *id)
> {
> @@ -547,7 +539,10 @@ static int ltc294x_i2c_probe(struct i2c_client *client,
>
> psy_cfg.drv_data = info;
>
> - INIT_DELAYED_WORK(&info->work, ltc294x_work);
> + ret = devm_delayed_work_autocancel(&client->dev, &info->work,
> + ltc294x_work);
> + if (ret)
> + return ret;
>
> ret = ltc294x_reset(info, prescaler_exp);
> if (ret < 0) {
> @@ -555,8 +550,8 @@ static int ltc294x_i2c_probe(struct i2c_client *client,
> return ret;
> }
>
> - info->supply = power_supply_register(&client->dev, &info->supply_desc,
> - &psy_cfg);
> + info->supply = devm_power_supply_register(&client->dev,
> + &info->supply_desc, &psy_cfg);
> if (IS_ERR(info->supply)) {
> dev_err(&client->dev, "failed to register ltc2941\n");
> return PTR_ERR(info->supply);
> @@ -655,7 +650,6 @@ static struct i2c_driver ltc294x_driver = {
> .pm = LTC294X_PM_OPS,
> },
> .probe = ltc294x_i2c_probe,
> - .remove = ltc294x_i2c_remove,
> .shutdown = ltc294x_i2c_shutdown,
> .id_table = ltc294x_i2c_id,
> };
> diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c
> index b6a538ebb378..70ea404b2a36 100644
> --- a/drivers/power/supply/sbs-battery.c
> +++ b/drivers/power/supply/sbs-battery.c
> @@ -7,6 +7,7 @@
>
> #include <linux/bits.h>
> #include <linux/delay.h>
> +#include <linux/devm-helpers.h>
> #include <linux/err.h>
> #include <linux/gpio/consumer.h>
> #include <linux/i2c.h>
> @@ -1165,7 +1166,10 @@ static int sbs_probe(struct i2c_client *client)
> }
> }
>
> - INIT_DELAYED_WORK(&chip->work, sbs_delayed_work);
> + rc = devm_delayed_work_autocancel(&client->dev, &chip->work,
> + sbs_delayed_work);
> + if (rc)
> + return rc;
>
> chip->power_supply = devm_power_supply_register(&client->dev, sbs_desc,
> &psy_cfg);
> @@ -1185,15 +1189,6 @@ static int sbs_probe(struct i2c_client *client)
> return rc;
> }
>
> -static int sbs_remove(struct i2c_client *client)
> -{
> - struct sbs_info *chip = i2c_get_clientdata(client);
> -
> - cancel_delayed_work_sync(&chip->work);
> -
> - return 0;
> -}
> -
> #if defined CONFIG_PM_SLEEP
>
> static int sbs_suspend(struct device *dev)
> @@ -1248,7 +1243,6 @@ MODULE_DEVICE_TABLE(of, sbs_dt_ids);
>
> static struct i2c_driver sbs_battery_driver = {
> .probe_new = sbs_probe,
> - .remove = sbs_remove,
> .alert = sbs_alert,
> .id_table = sbs_id,
> .driver = {
> --
> 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 =]
Download attachment "signature.asc" of type "application/pgp-signature" (834 bytes)
Powered by blists - more mailing lists