Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb895607 authored Apr 06, 2011 by Samuel Ortiz

mfd: Add platform data pointer back



Now that we have a way to pass MFD cells down to the sub drivers,
we can gradually get rid of mfd_data by putting the platform pointer
back in place.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

parent 4db70f73

drivers/mfd/mfd-core.c

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -88,6 +88,13 @@ static int mfd_add_device(struct device *parent, int id,

	pdev->dev.parent = parent;		pdev->dev.parent = parent;

			if (cell->pdata_size) {
			ret = platform_device_add_data(pdev,
			cell->platform_data, cell->pdata_size);
			if (ret)
			goto fail_res;
			}

	ret = mfd_platform_add_cell(pdev, cell);		ret = mfd_platform_add_cell(pdev, cell);
	if (ret)		if (ret)
	goto fail_res;		goto fail_res;

include/linux/mfd/core.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -36,6 +36,10 @@ struct mfd_cell {
	/* mfd_data can be used to pass data to client drivers */		/* mfd_data can be used to pass data to client drivers */
	void *mfd_data;		void *mfd_data;

			/* platform data passed to the sub devices drivers */
			void *platform_data;
			size_t pdata_size;

	/*		/*
	* These resources can be specified relative to the parent device.		* These resources can be specified relative to the parent device.
	* For accessing hardware you should use resources from the platform dev		* For accessing hardware you should use resources from the platform dev