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

mfd: twl4030-madc: Use managed resources

Browse source 
Update twl4030-madc driver to use managed resources.

Signed-off-by: Sebastian Reichel <sre@debian.org>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Tested-by: Marek Belisko <marek@goldelico.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Sebastian Reichel 2014-03-16 02:43:25 +01:00 • committed by Lee Jones
parent 0414855fdc
commit e7f22b7516
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-madc.c
View file

@ -702,14 +702,14 @@ static int twl4030_madc_probe(struct platform_device *pdev)
{ {
struct twl4030_madc_data *madc; struct twl4030_madc_data *madc;
struct twl4030_madc_platform_data *pdata = dev_get_platdata(&pdev->dev); struct twl4030_madc_platform_data *pdata = dev_get_platdata(&pdev->dev);
int ret; int irq, ret;
u8 regval; u8 regval;
if (!pdata) { if (!pdata) {
dev_err(&pdev->dev, "platform_data not available\n"); dev_err(&pdev->dev, "platform_data not available\n");
return -EINVAL; return -EINVAL;
} }
madc = kzalloc(sizeof(*madc), GFP_KERNEL); madc = devm_kzalloc(&pdev->dev, sizeof(*madc), GFP_KERNEL);
if (!madc) if (!madc)
return -ENOMEM; return -ENOMEM;
@ -726,7 +726,7 @@ static int twl4030_madc_probe(struct platform_device *pdev)
TWL4030_MADC_ISR1 : TWL4030_MADC_ISR2; TWL4030_MADC_ISR1 : TWL4030_MADC_ISR2;
ret = twl4030_madc_set_power(madc, 1); ret = twl4030_madc_set_power(madc, 1);
if (ret < 0) if (ret < 0)
goto err_power; return ret;
ret = twl4030_madc_set_current_generator(madc, 0, 1); ret = twl4030_madc_set_current_generator(madc, 0, 1);
if (ret < 0) if (ret < 0)
goto err_current_generator; goto err_current_generator;
@ -770,7 +770,9 @@ static int twl4030_madc_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, madc); platform_set_drvdata(pdev, madc);
mutex_init(&madc->lock); mutex_init(&madc->lock);
ret = request_threaded_irq(platform_get_irq(pdev, 0), NULL,
irq = platform_get_irq(pdev, 0);
ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
twl4030_madc_threaded_irq_handler, twl4030_madc_threaded_irq_handler,
IRQF_TRIGGER_RISING, "twl4030_madc", madc); IRQF_TRIGGER_RISING, "twl4030_madc", madc);
if (ret) { if (ret) {
@ -783,9 +785,6 @@ err_i2c:
twl4030_madc_set_current_generator(madc, 0, 0); twl4030_madc_set_current_generator(madc, 0, 0);
err_current_generator: err_current_generator:
twl4030_madc_set_power(madc, 0); twl4030_madc_set_power(madc, 0);
err_power:
kfree(madc);
return ret; return ret;
} }
@ -793,10 +792,8 @@ static int twl4030_madc_remove(struct platform_device *pdev)
{ {
struct twl4030_madc_data *madc = platform_get_drvdata(pdev); struct twl4030_madc_data *madc = platform_get_drvdata(pdev);
free_irq(platform_get_irq(pdev, 0), madc);
twl4030_madc_set_current_generator(madc, 0, 0); twl4030_madc_set_current_generator(madc, 0, 0);
twl4030_madc_set_power(madc, 0); twl4030_madc_set_power(madc, 0);
kfree(madc);
return 0; return 0;
} }