On Fri, 14 Apr 2017, sathyanarayanan.kuppuswamy@xxxxxxxxxxxxxxx wrote:
> From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@xxxxxxxxxxxxxxx>
>
> Cleanup the resource allocation/free code in probe function by using
> devm_* calls.
>
> Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@xxxxxxxxxxxxxxx>
> ---
> drivers/mfd/intel_soc_pmic_bxtwc.c | 54 +++++++++++++-------------------------
> 1 file changed, 18 insertions(+), 36 deletions(-)
For my own reference:
Acked-for-MFD-by: Lee Jones <lee.jones@xxxxxxxxxx>
> Changes since v1:
> * None
>
> diff --git a/drivers/mfd/intel_soc_pmic_bxtwc.c b/drivers/mfd/intel_soc_pmic_bxtwc.c
> index dc8af1d..442dc29 100644
> --- a/drivers/mfd/intel_soc_pmic_bxtwc.c
> +++ b/drivers/mfd/intel_soc_pmic_bxtwc.c
> @@ -400,45 +400,44 @@ static int bxtwc_probe(struct platform_device *pdev)
> return ret;
> }
>
> - ret = regmap_add_irq_chip(pmic->regmap, pmic->irq,
> - IRQF_ONESHOT | IRQF_SHARED,
> - 0, &bxtwc_regmap_irq_chip,
> - &pmic->irq_chip_data);
> + ret = devm_regmap_add_irq_chip(&pdev->dev, pmic->regmap, pmic->irq,
> + IRQF_ONESHOT | IRQF_SHARED,
> + 0, &bxtwc_regmap_irq_chip,
> + &pmic->irq_chip_data);
> if (ret) {
> dev_err(&pdev->dev, "Failed to add IRQ chip\n");
> return ret;
> }
>
> - ret = regmap_add_irq_chip(pmic->regmap, pmic->irq,
> - IRQF_ONESHOT | IRQF_SHARED,
> - 0, &bxtwc_regmap_irq_chip_level2,
> - &pmic->irq_chip_data_level2);
> + ret = devm_regmap_add_irq_chip(&pdev->dev, pmic->regmap, pmic->irq,
> + IRQF_ONESHOT | IRQF_SHARED,
> + 0, &bxtwc_regmap_irq_chip_level2,
> + &pmic->irq_chip_data_level2);
> if (ret) {
> 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,
> - IRQF_ONESHOT | IRQF_SHARED,
> - 0, &bxtwc_regmap_irq_chip_tmu,
> - &pmic->irq_chip_data_tmu);
> + ret = devm_regmap_add_irq_chip(&pdev->dev, pmic->regmap, pmic->irq,
> + IRQF_ONESHOT | IRQF_SHARED,
> + 0, &bxtwc_regmap_irq_chip_tmu,
> + &pmic->irq_chip_data_tmu);
> if (ret) {
> 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,
> - ARRAY_SIZE(bxt_wc_dev), NULL, 0,
> - NULL);
> + ret = devm_mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE, bxt_wc_dev,
> + ARRAY_SIZE(bxt_wc_dev), NULL, 0, NULL);
> if (ret) {
> dev_err(&pdev->dev, "Failed to add devices\n");
> - goto err_mfd;
> + return ret;
> }
>
> ret = sysfs_create_group(&pdev->dev.kobj, &bxtwc_group);
> if (ret) {
> dev_err(&pdev->dev, "Failed to create sysfs group %d\n", ret);
> - goto err_sysfs;
> + return ret;
> }
>
> /*
> @@ -452,28 +451,11 @@ static int bxtwc_probe(struct platform_device *pdev)
> BXTWC_MIRQLVL1_MCHGR, 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)
> {
> - struct intel_soc_pmic *pmic = dev_get_drvdata(&pdev->dev);
> -
> 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;
> }
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
