UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mfd: intel_soc_pmic_bxtwc: Utilize devm_* functions in driver probe 

Cleanup the resource allocation/free code in probe function by using
devm_* calls.

Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Kuppuswamy Sathyanarayanan 2017-06-05 12:08:04 -07:00 committed by Lee Jones
parent a1d28c5991
commit 5131f072e5
1 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/mfd/intel_soc_pmic_bxtwc.c
View File

@ -399,7 +399,7 @@ static int bxtwc_probe(struct platform_device *pdev)
return ret; return ret;
} }
ret = regmap_add_irq_chip(pmic->regmap, pmic->irq, ret = devm_regmap_add_irq_chip(&pdev->dev, pmic->regmap, pmic->irq,
IRQF_ONESHOT | IRQF_SHARED, IRQF_ONESHOT | IRQF_SHARED,
0, &bxtwc_regmap_irq_chip, 0, &bxtwc_regmap_irq_chip,
&pmic->irq_chip_data); &pmic->irq_chip_data);
@ -408,36 +408,35 @@ static int bxtwc_probe(struct platform_device *pdev)
return ret; return ret;
} }
ret = regmap_add_irq_chip(pmic->regmap, pmic->irq, ret = devm_regmap_add_irq_chip(&pdev->dev, pmic->regmap, pmic->irq,
IRQF_ONESHOT | IRQF_SHARED, IRQF_ONESHOT | IRQF_SHARED,
0, &bxtwc_regmap_irq_chip_level2, 0, &bxtwc_regmap_irq_chip_level2,
&pmic->irq_chip_data_level2); &pmic->irq_chip_data_level2);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to add secondary IRQ chip\n"); dev_err(&pdev->dev, "Failed to add secondary IRQ chip\n");
goto err_irq_chip_level2; return ret;
} }
ret = regmap_add_irq_chip(pmic->regmap, pmic->irq, ret = devm_regmap_add_irq_chip(&pdev->dev, pmic->regmap, pmic->irq,
IRQF_ONESHOT | IRQF_SHARED, IRQF_ONESHOT | IRQF_SHARED,
0, &bxtwc_regmap_irq_chip_tmu, 0, &bxtwc_regmap_irq_chip_tmu,
&pmic->irq_chip_data_tmu); &pmic->irq_chip_data_tmu);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to add TMU IRQ chip\n"); dev_err(&pdev->dev, "Failed to add TMU IRQ chip\n");
goto err_irq_chip_tmu; return ret;
} }
ret = mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE, bxt_wc_dev, ret = devm_mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE, bxt_wc_dev,
ARRAY_SIZE(bxt_wc_dev), NULL, 0, ARRAY_SIZE(bxt_wc_dev), NULL, 0, NULL);
NULL);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to add devices\n"); dev_err(&pdev->dev, "Failed to add devices\n");
goto err_mfd; return ret;
} }
ret = sysfs_create_group(&pdev->dev.kobj, &bxtwc_group); ret = sysfs_create_group(&pdev->dev.kobj, &bxtwc_group);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to create sysfs group %d\n", ret); dev_err(&pdev->dev, "Failed to create sysfs group %d\n", ret);
goto err_sysfs; return ret;
} }
/* /*
@ -451,28 +450,11 @@ static int bxtwc_probe(struct platform_device *pdev)
BXTWC_MIRQLVL1_MCHGR, 0); BXTWC_MIRQLVL1_MCHGR, 0);
return 0; return 0;
err_sysfs:
mfd_remove_devices(&pdev->dev);
err_mfd:
regmap_del_irq_chip(pmic->irq, pmic->irq_chip_data_tmu);
err_irq_chip_tmu:
regmap_del_irq_chip(pmic->irq, pmic->irq_chip_data_level2);
err_irq_chip_level2:
regmap_del_irq_chip(pmic->irq, pmic->irq_chip_data);
return ret;
} }
static int bxtwc_remove(struct platform_device *pdev) static int bxtwc_remove(struct platform_device *pdev)
{ {
struct intel_soc_pmic *pmic = dev_get_drvdata(&pdev->dev);
sysfs_remove_group(&pdev->dev.kobj, &bxtwc_group); sysfs_remove_group(&pdev->dev.kobj, &bxtwc_group);
mfd_remove_devices(&pdev->dev);
regmap_del_irq_chip(pmic->irq, pmic->irq_chip_data);
regmap_del_irq_chip(pmic->irq, pmic->irq_chip_data_level2);
regmap_del_irq_chip(pmic->irq, pmic->irq_chip_data_tmu);
return 0; return 0;
} }