Commit d30e2c30 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Lee Jones
Browse files

mfd: intel_soc_pmic_bxtwc: Use dev_err_probe() 



Simplify the mux error path a bit by using dev_err_probe().

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20220628221747.33956-4-andriy.shevchenko@linux.intel.com
parent 2790a70c

drivers/mfd/intel_soc_pmic_bxtwc.c

+26 −60
Original line number Diff line number Diff line
@@ -417,12 +417,9 @@ static int bxtwc_add_chained_irq_chip(struct intel_soc_pmic *pmic, 
	int irq;



	irq = regmap_irq_get_virq(pdata, pirq);

	if (irq < 0) {

		dev_err(pmic->dev,

			"Failed to get parent vIRQ(%d) for chip %s, ret:%d\n",

			pirq, chip->name, irq);

		return irq;

	}

	if (irq < 0)

		return dev_err_probe(pmic->dev, irq, "Failed to get parent vIRQ(%d) for chip %s\n",

				     pirq, chip->name);



	return devm_regmap_add_irq_chip(pmic->dev, pmic->regmap, irq, irq_flags,

					0, chip, data);
@@ -430,6 +427,7 @@ static int bxtwc_add_chained_irq_chip(struct intel_soc_pmic *pmic, 


static int bxtwc_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	int ret;

	acpi_handle handle;

	acpi_status status;
@@ -438,15 +436,10 @@ static int bxtwc_probe(struct platform_device *pdev) 


	handle = ACPI_HANDLE(&pdev->dev);

	status = acpi_evaluate_integer(handle, "_HRV", NULL, &hrv);

	if (ACPI_FAILURE(status)) {

		dev_err(&pdev->dev, "Failed to get PMIC hardware revision\n");

		return -ENODEV;

	}

	if (hrv != BROXTON_PMIC_WC_HRV) {

		dev_err(&pdev->dev, "Invalid PMIC hardware revision: %llu\n",

			hrv);

		return -ENODEV;

	}

	if (ACPI_FAILURE(status))

		return dev_err_probe(dev, -ENODEV, "Failed to get PMIC hardware revision\n");

	if (hrv != BROXTON_PMIC_WC_HRV)

		return dev_err_probe(dev, -ENODEV, "Invalid PMIC hardware revision: %llu\n", hrv);



	pmic = devm_kzalloc(&pdev->dev, sizeof(*pmic), GFP_KERNEL);

	if (!pmic)
@@ -466,40 +459,31 @@ static int bxtwc_probe(struct platform_device *pdev) 


	pmic->regmap = devm_regmap_init(&pdev->dev, NULL, pmic,

					&bxtwc_regmap_config);

	if (IS_ERR(pmic->regmap)) {

		ret = PTR_ERR(pmic->regmap);

		dev_err(&pdev->dev, "Failed to initialise regmap: %d\n", ret);

		return ret;

	}

	if (IS_ERR(pmic->regmap))

		return dev_err_probe(dev, PTR_ERR(pmic->regmap), "Failed to initialise regmap\n");



	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;

	}

	if (ret)

		return dev_err_probe(dev, ret, "Failed to add IRQ chip\n");



	ret = bxtwc_add_chained_irq_chip(pmic, pmic->irq_chip_data,

					 BXTWC_PWRBTN_LVL1_IRQ,

					 IRQF_ONESHOT,

					 &bxtwc_regmap_irq_chip_pwrbtn,

					 &pmic->irq_chip_data_pwrbtn);

	if (ret) {

		dev_err(&pdev->dev, "Failed to add PWRBTN IRQ chip\n");

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "Failed to add PWRBTN IRQ chip\n");



	ret = bxtwc_add_chained_irq_chip(pmic, pmic->irq_chip_data,

					 BXTWC_TMU_LVL1_IRQ,

					 IRQF_ONESHOT,

					 &bxtwc_regmap_irq_chip_tmu,

					 &pmic->irq_chip_data_tmu);

	if (ret) {

		dev_err(&pdev->dev, "Failed to add TMU IRQ chip\n");

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "Failed to add TMU IRQ chip\n");



	/* Add chained IRQ handler for BCU IRQs */

	ret = bxtwc_add_chained_irq_chip(pmic, pmic->irq_chip_data,
@@ -507,12 +491,8 @@ static int bxtwc_probe(struct platform_device *pdev) 
					 IRQF_ONESHOT,

					 &bxtwc_regmap_irq_chip_bcu,

					 &pmic->irq_chip_data_bcu);





	if (ret) {

		dev_err(&pdev->dev, "Failed to add BUC IRQ chip\n");

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "Failed to add BUC IRQ chip\n");



	/* Add chained IRQ handler for ADC IRQs */

	ret = bxtwc_add_chained_irq_chip(pmic, pmic->irq_chip_data,
@@ -520,12 +500,8 @@ static int bxtwc_probe(struct platform_device *pdev) 
					 IRQF_ONESHOT,

					 &bxtwc_regmap_irq_chip_adc,

					 &pmic->irq_chip_data_adc);





	if (ret) {

		dev_err(&pdev->dev, "Failed to add ADC IRQ chip\n");

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "Failed to add ADC IRQ chip\n");



	/* Add chained IRQ handler for CHGR IRQs */

	ret = bxtwc_add_chained_irq_chip(pmic, pmic->irq_chip_data,
@@ -533,12 +509,8 @@ static int bxtwc_probe(struct platform_device *pdev) 
					 IRQF_ONESHOT,

					 &bxtwc_regmap_irq_chip_chgr,

					 &pmic->irq_chip_data_chgr);





	if (ret) {

		dev_err(&pdev->dev, "Failed to add CHGR IRQ chip\n");

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "Failed to add CHGR IRQ chip\n");



	/* Add chained IRQ handler for CRIT IRQs */

	ret = bxtwc_add_chained_irq_chip(pmic, pmic->irq_chip_data,
@@ -546,19 +518,13 @@ static int bxtwc_probe(struct platform_device *pdev) 
					 IRQF_ONESHOT,

					 &bxtwc_regmap_irq_chip_crit,

					 &pmic->irq_chip_data_crit);





	if (ret) {

		dev_err(&pdev->dev, "Failed to add CRIT IRQ chip\n");

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "Failed to add CRIT IRQ chip\n");



	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");

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "Failed to add devices\n");



	/*

	 * There is known hw bug. Upon reset BIT 5 of register