Commit b944a688 authored by Lee Jones's avatar Lee Jones
Browse files

mfd: mfd-core: Move pdev->mfd_cell creation back into mfd_add_device() 



Most of the complexity of mfd_platform_add_cell() has been removed. The
only functionality left duplicates cell memory into the child's platform
device. Since it's only a few lines, moving it to the main thread and
removing the superfluous function makes sense.

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Reviewed-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Reviewed-by: default avatarMark Brown <broonie@kernel.org>
parent 5a47c0fb

drivers/mfd/mfd-core.c

+4 −17
Original line number Diff line number Diff line
@@ -49,19 +49,6 @@ int mfd_cell_disable(struct platform_device *pdev) 
}

EXPORT_SYMBOL(mfd_cell_disable);



static int mfd_platform_add_cell(struct platform_device *pdev,

				 const struct mfd_cell *cell)

{

	if (!cell)

		return 0;



	pdev->mfd_cell = kmemdup(cell, sizeof(*cell), GFP_KERNEL);

	if (!pdev->mfd_cell)

		return -ENOMEM;



	return 0;

}



#if IS_ENABLED(CONFIG_ACPI)

static void mfd_acpi_add_device(const struct mfd_cell *cell,

				struct platform_device *pdev)
@@ -141,6 +128,10 @@ static int mfd_add_device(struct device *parent, int id, 
	if (!pdev)

		goto fail_alloc;



	pdev->mfd_cell = kmemdup(cell, sizeof(*cell), GFP_KERNEL);

	if (!pdev->mfd_cell)

		goto fail_device;



	res = kcalloc(cell->num_resources, sizeof(*res), GFP_KERNEL);

	if (!res)

		goto fail_device;
@@ -183,10 +174,6 @@ static int mfd_add_device(struct device *parent, int id, 
			goto fail_alias;

	}



	ret = mfd_platform_add_cell(pdev, cell);

	if (ret)

		goto fail_alias;



	for (r = 0; r < cell->num_resources; r++) {

		res[r].name = cell->resources[r].name;

		res[r].flags = cell->resources[r].flags;

CRA Git | Maintained and supported by SUSTech CRA and CCSE