diff mbox series

power: supply: max8997_charger: Use devm_work_autocancel()

Message ID 1404087e1f99dfb5e5d59ee29f477a2f2d960bb8.1644751133.git.christophe.jaillet@wanadoo.fr
State Accepted
Commit fdc9ce72cffea59c564dc890086b0d0b714d05b0
Headers show
Series power: supply: max8997_charger: Use devm_work_autocancel() | expand

Commit Message

Christophe JAILLET Feb. 13, 2022, 11:19 a.m. UTC
Use devm_work_autocancel() instead of hand writing it.
It saves a few lines of code.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/power/supply/max8997_charger.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

Comments

Sebastian Reichel Feb. 24, 2022, 11:23 a.m. UTC | #1
Hi,

On Sun, Feb 13, 2022 at 12:19:31PM +0100, Christophe JAILLET wrote:
> Use devm_work_autocancel() instead of hand writing it.
> It saves a few lines of code.
> 
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---

Thanks, queued.

-- Sebastian

>  drivers/power/supply/max8997_charger.c | 12 +++---------
>  1 file changed, 3 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/power/supply/max8997_charger.c b/drivers/power/supply/max8997_charger.c
> index 25207fe2aa68..127c73b0b3bd 100644
> --- a/drivers/power/supply/max8997_charger.c
> +++ b/drivers/power/supply/max8997_charger.c
> @@ -14,6 +14,7 @@
>  #include <linux/mfd/max8997.h>
>  #include <linux/mfd/max8997-private.h>
>  #include <linux/regulator/consumer.h>
> +#include <linux/devm-helpers.h>
>  
>  /* MAX8997_REG_STATUS4 */
>  #define DCINOK_SHIFT		1
> @@ -94,13 +95,6 @@ static int max8997_battery_get_property(struct power_supply *psy,
>  	return 0;
>  }
>  
> -static void max8997_battery_extcon_evt_stop_work(void *data)
> -{
> -	struct charger_data *charger = data;
> -
> -	cancel_work_sync(&charger->extcon_work);
> -}
> -
>  static void max8997_battery_extcon_evt_worker(struct work_struct *work)
>  {
>  	struct charger_data *charger =
> @@ -255,8 +249,8 @@ static int max8997_battery_probe(struct platform_device *pdev)
>  	}
>  
>  	if (!IS_ERR(charger->reg) && !IS_ERR_OR_NULL(charger->edev)) {
> -		INIT_WORK(&charger->extcon_work, max8997_battery_extcon_evt_worker);
> -		ret = devm_add_action(&pdev->dev, max8997_battery_extcon_evt_stop_work, charger);
> +		ret = devm_work_autocancel(&pdev->dev, &charger->extcon_work,
> +					   max8997_battery_extcon_evt_worker);
>  		if (ret) {
>  			dev_err(&pdev->dev, "failed to add extcon evt stop action: %d\n", ret);
>  			return ret;
> -- 
> 2.32.0
>
diff mbox series

Patch

diff --git a/drivers/power/supply/max8997_charger.c b/drivers/power/supply/max8997_charger.c
index 25207fe2aa68..127c73b0b3bd 100644
--- a/drivers/power/supply/max8997_charger.c
+++ b/drivers/power/supply/max8997_charger.c
@@ -14,6 +14,7 @@ 
 #include <linux/mfd/max8997.h>
 #include <linux/mfd/max8997-private.h>
 #include <linux/regulator/consumer.h>
+#include <linux/devm-helpers.h>
 
 /* MAX8997_REG_STATUS4 */
 #define DCINOK_SHIFT		1
@@ -94,13 +95,6 @@  static int max8997_battery_get_property(struct power_supply *psy,
 	return 0;
 }
 
-static void max8997_battery_extcon_evt_stop_work(void *data)
-{
-	struct charger_data *charger = data;
-
-	cancel_work_sync(&charger->extcon_work);
-}
-
 static void max8997_battery_extcon_evt_worker(struct work_struct *work)
 {
 	struct charger_data *charger =
@@ -255,8 +249,8 @@  static int max8997_battery_probe(struct platform_device *pdev)
 	}
 
 	if (!IS_ERR(charger->reg) && !IS_ERR_OR_NULL(charger->edev)) {
-		INIT_WORK(&charger->extcon_work, max8997_battery_extcon_evt_worker);
-		ret = devm_add_action(&pdev->dev, max8997_battery_extcon_evt_stop_work, charger);
+		ret = devm_work_autocancel(&pdev->dev, &charger->extcon_work,
+					   max8997_battery_extcon_evt_worker);
 		if (ret) {
 			dev_err(&pdev->dev, "failed to add extcon evt stop action: %d\n", ret);
 			return ret;