mfd: core: Don't use devres functions before device is added (d137be00) · Commits · 戴 / test

The supply aliases for the MFD devices were being added using devres but the device hasn't been added at this point and as such we can't use devres. The MFD already has a function that removes devices this patch uses the non-devres versions of the supply alias functions and adds an unregister in mfd_remove_devices_fn. Reported-by:

Carlo Caione <carlo@caione.org> Reported-by:

Mark Brown <broonie@kernel.org> Signed-off-by:

Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Reviewed-by:

Mark Brown <broonie@kernel.org> Signed-off-by:

Lee Jones <lee.jones@linaro.org>

drivers/mfd/mfd-core.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -102,7 +102,7 @@ static int mfd_add_device(struct device *parent, int id,
		pdev->dev.dma_mask = parent->dma_mask;
		pdev->dev.dma_parms = parent->dma_parms;

		ret = devm_regulator_bulk_register_supply_alias(
		ret = regulator_bulk_register_supply_alias(
		&pdev->dev, cell->parent_supplies,
		parent, cell->parent_supplies,
		cell->num_parent_supplies);
		@@ -182,7 +182,7 @@ static int mfd_add_device(struct device *parent, int id,
		return 0;

		fail_alias:
		devm_regulator_bulk_unregister_supply_alias(&pdev->dev,
		regulator_bulk_unregister_supply_alias(&pdev->dev,
		cell->parent_supplies,
		cell->num_parent_supplies);
		fail_res:
		@@ -238,6 +238,9 @@ static int mfd_remove_devices_fn(struct device dev, void c)
		pdev = to_platform_device(dev);
		cell = mfd_get_cell(pdev);

		regulator_bulk_unregister_supply_alias(dev, cell->parent_supplies,
		cell->num_parent_supplies);

		/* find the base address of usage_count pointers (for freeing) */
		if (!usage_count \|\| (cell->usage_count < usage_count))
		*usage_count = cell->usage_count;

Admin message