evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mfd: adp5520: Convert to managed resources for allocating memory

Browse source 
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Lee Jones 2013-05-23 16:25:08 +01:00 • committed by Samuel Ortiz
parent c211b6b9c0
commit 76ba0b896b
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/mfd/adp5520.c
View file

@ -223,7 +223,7 @@ static int adp5520_probe(struct i2c_client *client,
return -ENODEV; return -ENODEV;
} }
chip = kzalloc(sizeof(*chip), GFP_KERNEL); chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
if (!chip) if (!chip)
return -ENOMEM; return -ENOMEM;
@ -244,7 +244,7 @@ static int adp5520_probe(struct i2c_client *client,
if (ret) { if (ret) {
dev_err(&client->dev, "failed to request irq %d\n", dev_err(&client->dev, "failed to request irq %d\n",
chip->irq); chip->irq);
goto out_free_chip; return ret;
} }
} }
@ -302,9 +302,6 @@ out_free_irq:
if (chip->irq) if (chip->irq)
free_irq(chip->irq, chip); free_irq(chip->irq, chip);
out_free_chip:
kfree(chip);
return ret; return ret;
} }
@ -317,7 +314,6 @@ static int adp5520_remove(struct i2c_client *client)
adp5520_remove_subdevs(chip); adp5520_remove_subdevs(chip);
adp5520_write(chip->dev, ADP5520_MODE_STATUS, 0); adp5520_write(chip->dev, ADP5520_MODE_STATUS, 0);
kfree(chip);
return 0; return 0;
} }