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

mfd: twl4030-audio: Convert to use devm_kzalloc

Browse source 
To clean up the module probe and remove functions.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Peter Ujfalusi 2012-09-10 13:46:20 +03:00 • committed by Mark Brown
parent 9232aa507f
commit bade699c67
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/mfd/twl4030-audio.c
View file

@ -188,7 +188,8 @@ static int __devinit twl4030_audio_probe(struct platform_device *pdev)
twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
val, TWL4030_REG_APLL_CTL); val, TWL4030_REG_APLL_CTL);
audio = kzalloc(sizeof(struct twl4030_audio), GFP_KERNEL); audio = devm_kzalloc(&pdev->dev, sizeof(struct twl4030_audio),
GFP_KERNEL);
if (!audio) if (!audio)
return -ENOMEM; return -ENOMEM;
@ -229,22 +230,18 @@ static int __devinit twl4030_audio_probe(struct platform_device *pdev)
ret = -ENODEV; ret = -ENODEV;
} }
if (!ret) if (ret) {
return 0; platform_set_drvdata(pdev, NULL);
twl4030_audio_dev = NULL;
}
platform_set_drvdata(pdev, NULL);
kfree(audio);
twl4030_audio_dev = NULL;
return ret; return ret;
} }
static int __devexit twl4030_audio_remove(struct platform_device *pdev) static int __devexit twl4030_audio_remove(struct platform_device *pdev)
{ {
struct twl4030_audio *audio = platform_get_drvdata(pdev);
mfd_remove_devices(&pdev->dev); mfd_remove_devices(&pdev->dev);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
kfree(audio);
twl4030_audio_dev = NULL; twl4030_audio_dev = NULL;
return 0; return 0;