power: 88pm860x_charger: drop kfree of devm_kzalloc'd data
PATCH 1/14 power: 88pm860x_charger: drop kfree of devm_kzalloc'd data
The devm_kzalloc function allocates memory that is released automatically, when a driver detaches. Thus, there is no reason to explicitly call kfree in probe or remove functions.
--- drivers/power/88pm860x_charger.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/power/88pm860x_charger.c +0 -2
@@ -714,7 +714,6 @@ out_irq:while (--i >=0 )free_irq (info->irq[i], info); out: -kfree (info);return ret; }
@@ -728,7 +727,6 @@ static int pm860x_charger_remove(struct platform_device *pdev)free_irq (info->irq[0 ], info);for (i =0 ; i < info->irq_nums; i++)free_irq (info->irq[i], info); -kfree (info);return 0 ; }
Signature · 1 line
1.7.2.5
PATCH 2/14 power: max8925_power: use devm_kzalloc()
Use devm_kzalloc() to make cleanup paths more simple.
--- drivers/power/max8925_power.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
drivers/power/max8925_power.c +2 -3
@@ -489,7 +489,8 @@ static int max8925_power_probe(struct platform_device *pdev)return -EINVAL ; } - info =kzalloc (sizeof (struct max8925_power_info ),GFP_KERNEL ); + info =devm_kzalloc (&pdev->dev,sizeof (struct max8925_power_info ), +GFP_KERNEL );if (!info)return -ENOMEM ; info->chip = chip;
@@ -546,7 +547,6 @@ out_battery: out_usb:power_supply_unregister (&info->ac); out: -kfree (info);return ret; }
@@ -559,7 +559,6 @@ static int max8925_power_remove(struct platform_device *pdev)power_supply_unregister (&info->usb);power_supply_unregister (&info->battery);max8925_deinit_charger (info); -kfree (info); }return 0 ; }
Signature · 1 line
1.7.2.5
PATCH 3/14 power: da9030_battery: use devm_kzalloc()
In reply to Jingoo HanUse devm_kzalloc() to make cleanup paths more simple.
--- drivers/power/da9030_battery.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)
drivers/power/da9030_battery.c +1 -5
@@ -505,7 +505,7 @@ static int da9030_battery_probe(struct platform_device *pdev) pdata->charge_millivolt > 4350)return -EINVAL ; - charger =kzalloc (sizeof (*charger),GFP_KERNEL ); + charger =devm_kzalloc (&pdev->dev,sizeof (*charger),GFP_KERNEL );if (charger ==NULL )return -ENOMEM ;
@@ -557,8 +557,6 @@ err_notifier:cancel_delayed_work (&charger->work); err_charger_init: -kfree (charger); -return ret; }
@@ -575,8 +573,6 @@ static int da9030_battery_remove(struct platform_device *dev)da9030_set_charge (charger,0 );power_supply_unregister (&charger->psy); -kfree (charger); -return 0 ; }
Signature · 1 line
1.7.2.5
PATCH 4/14 power: da9052-battery: use devm_kzalloc()
In reply to Jingoo HanUse devm_kzalloc() to make cleanup paths more simple.
--- drivers/power/da9052-battery.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
drivers/power/da9052-battery.c +2 -3
@@ -594,7 +594,8 @@ static s32 da9052_bat_probe(struct platform_device *pdev)int ret;int i; - bat =kzalloc (sizeof (struct da9052_battery ),GFP_KERNEL ); + bat =devm_kzalloc (&pdev->dev,sizeof (struct da9052_battery ), +GFP_KERNEL );if (!bat)return -ENOMEM ;
@@ -635,7 +636,6 @@ err:while (--i >=0 )da9052_free_irq (bat->da9052, da9052_bat_irq_bits[i], bat); -kfree (bat);return ret; }static int da9052_bat_remove (struct platform_device *pdev)
@@ -647,7 +647,6 @@ static int da9052_bat_remove(struct platform_device *pdev)da9052_free_irq (bat->da9052, da9052_bat_irq_bits[i], bat);power_supply_unregister (&bat->psy); -kfree (bat);return 0 ; }
Signature · 1 line
1.7.2.5
PATCH 5/14 power: ds2760_battery: use devm_kzalloc()
In reply to Jingoo HanUse devm_kzalloc() to make cleanup paths more simple.
--- drivers/power/ds2760_battery.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
drivers/power/ds2760_battery.c +1 -3
@@ -512,7 +512,7 @@ static int ds2760_battery_probe(struct platform_device *pdev)int retval =0 ;struct ds2760_device_info *di; - di =kzalloc (sizeof (*di),GFP_KERNEL ); + di =devm_kzalloc (&pdev->dev,sizeof (*di),GFP_KERNEL );if (!di) { retval = -ENOMEM ; goto di_alloc_failed;
@@ -576,7 +576,6 @@ static int ds2760_battery_probe(struct platform_device *pdev) workqueue_failed:power_supply_unregister (&di->bat); batt_failed: -kfree (di); di_alloc_failed: success:return retval;
@@ -590,7 +589,6 @@ static int ds2760_battery_remove(struct platform_device *pdev)cancel_delayed_work_sync (&di->set_charged_work);destroy_workqueue (di->monitor_wqueue);power_supply_unregister (&di->bat); -kfree (di);return 0 ; }
Signature · 1 line
1.7.2.5
PATCH 6/14 power: ds2780_battery: use devm_kzalloc()
In reply to Jingoo HanUse devm_kzalloc() to make cleanup paths more simple.
--- drivers/power/ds2780_battery.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
drivers/power/ds2780_battery.c +2 -5
@@ -760,7 +760,7 @@ static int ds2780_battery_probe(struct platform_device *pdev)int ret =0 ;struct ds2780_device_info *dev_info; - dev_info =kzalloc (sizeof (*dev_info),GFP_KERNEL ); + dev_info =devm_kzalloc (&pdev->dev,sizeof (*dev_info),GFP_KERNEL );if (!dev_info) { ret = -ENOMEM ; goto fail;
@@ -779,7 +779,7 @@ static int ds2780_battery_probe(struct platform_device *pdev) ret =power_supply_register (&pdev->dev, &dev_info->bat);if (ret) {dev_err (dev_info->dev,"failed to register battery\n" ); - goto fail_free_info; + goto fail; } ret =sysfs_create_group (&dev_info->bat.dev->kobj, &ds2780_attr_group);
@@ -813,8 +813,6 @@ fail_remove_group:sysfs_remove_group (&dev_info->bat.dev->kobj, &ds2780_attr_group); fail_unregister:power_supply_unregister (&dev_info->bat); -fail_free_info: -kfree (dev_info); fail:return ret; }
@@ -828,7 +826,6 @@ static int ds2780_battery_remove(struct platform_device *pdev)power_supply_unregister (&dev_info->bat); -kfree (dev_info);return 0 ; }
Signature · 1 line
1.7.2.5
PATCH 7/14 power: gpio-charger: use devm_kzalloc()
In reply to Jingoo HanUse devm_kzalloc() to make cleanup paths more simple.
--- drivers/power/gpio-charger.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
drivers/power/gpio-charger.c +2 -3
@@ -86,7 +86,8 @@ static int gpio_charger_probe(struct platform_device *pdev)return -EINVAL ; } - gpio_charger =kzalloc (sizeof (*gpio_charger),GFP_KERNEL ); + gpio_charger =devm_kzalloc (&pdev->dev,sizeof (*gpio_charger), +GFP_KERNEL );if (!gpio_charger) {dev_err (&pdev->dev,"Failed to alloc driver structure\n" );return -ENOMEM ;
@@ -140,7 +141,6 @@ static int gpio_charger_probe(struct platform_device *pdev) err_gpio_free:gpio_free (pdata->gpio); err_free: -kfree (gpio_charger);return ret; }
@@ -156,7 +156,6 @@ static int gpio_charger_remove(struct platform_device *pdev)gpio_free (gpio_charger->pdata->gpio);platform_set_drvdata (pdev,NULL ); -kfree (gpio_charger);return 0 ; }
Signature · 1 line
1.7.2.5
PATCH 8/14 power: isp1704_charger: use devm_kzalloc()
In reply to Jingoo HanUse devm_kzalloc() to make cleanup paths more simple.
--- drivers/power/isp1704_charger.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)
drivers/power/isp1704_charger.c +1 -4
@@ -411,7 +411,7 @@ static int isp1704_charger_probe(struct platform_device *pdev)struct isp1704_charger *isp;int ret = -ENODEV ; - isp =kzalloc (sizeof *isp,GFP_KERNEL ); + isp =devm_kzalloc (&pdev->dev,sizeof (*isp),GFP_KERNEL );if (!isp)return -ENOMEM ;
@@ -477,8 +477,6 @@ fail1:isp1704_charger_set_power (isp,0 );usb_put_phy (isp->phy); fail0: -kfree (isp); -dev_err (&pdev->dev,"failed to register isp1704 with error %d\n" , ret);return ret;
@@ -492,7 +490,6 @@ static int isp1704_charger_remove(struct platform_device *pdev)power_supply_unregister (&isp->psy);usb_put_phy (isp->phy);isp1704_charger_set_power (isp,0 ); -kfree (isp);return 0 ; }
Signature · 1 line
1.7.2.5
PATCH 9/14 power: max8903_charger: use devm_kzalloc()
In reply to Jingoo HanUse devm_kzalloc() to make cleanup paths more simple.
--- drivers/power/max8903_charger.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
drivers/power/max8903_charger.c +1 -3
@@ -189,7 +189,7 @@ static int max8903_probe(struct platform_device *pdev)int ta_in =0 ;int usb_in =0 ; - data =kzalloc (sizeof (struct max8903_data ),GFP_KERNEL ); + data =devm_kzalloc (dev,sizeof (struct max8903_data ),GFP_KERNEL );if (data ==NULL ) {dev_err (dev,"Cannot allocate memory.\n" );return -ENOMEM ;
@@ -341,7 +341,6 @@ err_dc_irq: err_psy:power_supply_unregister (&data->psy); err: -kfree (data);return ret; }
@@ -359,7 +358,6 @@ static int max8903_remove(struct platform_device *pdev)if (pdata->dc_valid)free_irq (gpio_to_irq (pdata->dok), data);power_supply_unregister (&data->psy); -kfree (data); }return 0 ;
Signature · 1 line
1.7.2.5
PATCH 10/14 power: max8997_charger: use devm_kzalloc()
In reply to Jingoo HanUse devm_kzalloc() to make cleanup paths more simple.
--- drivers/power/max8997_charger.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)
drivers/power/max8997_charger.c +3 -6
@@ -138,7 +138,8 @@ static int max8997_battery_probe(struct platform_device *pdev)return ret; } - charger =kzalloc (sizeof (struct charger_data ),GFP_KERNEL ); + charger =devm_kzalloc (&pdev->dev,sizeof (struct charger_data ), +GFP_KERNEL );if (charger ==NULL ) {dev_err (&pdev->dev,"Cannot allocate memory.\n" );return -ENOMEM ;
@@ -158,13 +159,10 @@ static int max8997_battery_probe(struct platform_device *pdev) ret =power_supply_register (&pdev->dev, &charger->battery);if (ret) {dev_err (&pdev->dev,"failed: power supply register\n" ); - goto err; +return ret; }return 0 ; -err: -kfree (charger); -return ret; }static int max8997_battery_remove (struct platform_device *pdev)
@@ -172,7 +170,6 @@ static int max8997_battery_remove(struct platform_device *pdev)struct charger_data *charger =platform_get_drvdata (pdev);power_supply_unregister (&charger->battery); -kfree (charger);return 0 ; }
Signature · 1 line
1.7.2.5
PATCH 11/14 power: max8998_charger: use devm_kzalloc()
In reply to Jingoo HanUse devm_kzalloc() to make cleanup paths more simple.
--- drivers/power/max8998_charger.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
drivers/power/max8998_charger.c +2 -3
@@ -88,7 +88,8 @@ static int max8998_battery_probe(struct platform_device *pdev)return -ENODEV ; } - max8998 =kzalloc (sizeof (struct max8998_battery_data ),GFP_KERNEL ); + max8998 =devm_kzalloc (&pdev->dev,sizeof (struct max8998_battery_data ), +GFP_KERNEL );if (!max8998)return -ENOMEM ;
@@ -174,7 +175,6 @@ static int max8998_battery_probe(struct platform_device *pdev)return 0 ; err: -kfree (max8998);return ret; }
@@ -183,7 +183,6 @@ static int max8998_battery_remove(struct platform_device *pdev)struct max8998_battery_data *max8998 =platform_get_drvdata (pdev);power_supply_unregister (&max8998->battery); -kfree (max8998);return 0 ; }
Signature · 1 line
1.7.2.5
PATCH 12/14 power: pcf50633-charger: use devm_kzalloc()
In reply to Jingoo HanUse devm_kzalloc() to make cleanup paths more simple.
--- drivers/power/pcf50633-charger.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-)
drivers/power/pcf50633-charger.c +1 -6
@@ -373,7 +373,7 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)int i;u8 mbcs1; - mbc =kzalloc (sizeof (*mbc),GFP_KERNEL ); + mbc =devm_kzalloc (&pdev->dev,sizeof (*mbc),GFP_KERNEL );if (!mbc)return -ENOMEM ;
@@ -413,7 +413,6 @@ static int pcf50633_mbc_probe(struct platform_device *pdev) ret =power_supply_register (&pdev->dev, &mbc->adapter);if (ret) {dev_err (mbc->pcf->dev,"failed to register adapter\n" ); -kfree (mbc);return ret; }
@@ -421,7 +420,6 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)if (ret) {dev_err (mbc->pcf->dev,"failed to register usb\n" );power_supply_unregister (&mbc->adapter); -kfree (mbc);return ret; }
@@ -430,7 +428,6 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)dev_err (mbc->pcf->dev,"failed to register ac\n" );power_supply_unregister (&mbc->adapter);power_supply_unregister (&mbc->usb); -kfree (mbc);return ret; }
@@ -461,8 +458,6 @@ static int pcf50633_mbc_remove(struct platform_device *pdev)power_supply_unregister (&mbc->adapter);power_supply_unregister (&mbc->ac); -kfree (mbc); -return 0 ; }
Signature · 1 line
1.7.2.5
PATCH 13/14 power: rx51_battery: use devm_kzalloc()
In reply to Jingoo HanUse devm_kzalloc() to make cleanup paths more simple.
--- drivers/power/rx51_battery.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
drivers/power/rx51_battery.c +1 -3
@@ -202,7 +202,7 @@ static int rx51_battery_probe(struct platform_device *pdev)struct rx51_device_info *di;int ret; - di =kzalloc (sizeof (*di),GFP_KERNEL ); + di =devm_kzalloc (&pdev->dev,sizeof (*di),GFP_KERNEL );if (!di)return -ENOMEM ;
@@ -217,7 +217,6 @@ static int rx51_battery_probe(struct platform_device *pdev) ret =power_supply_register (di->dev, &di->bat);if (ret) {platform_set_drvdata (pdev,NULL ); -kfree (di);return ret; }
@@ -230,7 +229,6 @@ static int rx51_battery_remove(struct platform_device *pdev)power_supply_unregister (&di->bat);platform_set_drvdata (pdev,NULL ); -kfree (di);return 0 ; }
Signature · 1 line
1.7.2.5
PATCH 14/14 power: wm831x_backup: use devm_kzalloc()
In reply to Jingoo HanUse devm_kzalloc() to make cleanup paths more simple.
--- drivers/power/wm831x_backup.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-)
drivers/power/wm831x_backup.c +2 -8
@@ -169,7 +169,8 @@ static int wm831x_backup_probe(struct platform_device *pdev)struct power_supply *backup;int ret; - devdata =kzalloc (sizeof (struct wm831x_backup ),GFP_KERNEL ); + devdata =devm_kzalloc (&pdev->dev,sizeof (struct wm831x_backup ), +GFP_KERNEL );if (devdata ==NULL )return -ENOMEM ;
@@ -197,14 +198,8 @@ static int wm831x_backup_probe(struct platform_device *pdev) backup->num_properties =ARRAY_SIZE (wm831x_backup_props); backup->get_property = wm831x_backup_get_prop; ret =power_supply_register (&pdev->dev, backup); -if (ret) - goto err_kmalloc;return ret; - -err_kmalloc: -kfree (devdata); -return ret; }static int wm831x_backup_remove (struct platform_device *pdev)
@@ -213,7 +208,6 @@ static int wm831x_backup_remove(struct platform_device *pdev)power_supply_unregister (&devdata->backup);kfree (devdata->backup.name); -kfree (devdata);return 0 ; }
Signature · 1 line
1.7.2.5
Quoted 6 lines · Jingoo Han
The
devm_kzallocfunction allocates memory that is released automatically, when a driver detaches. Thus, there is no reason to explicitly call kfree in probe or remove functions.Signed-off-by Jingoo Han <[email protected]>---
1-14 applied, thanks!
Anton