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

Commit ec71974f authored Apr 06, 2011 by Samuel Ortiz

mmc: Use device platform_data to retrieve tmio_mmc platform bits



With the addition of the platform device mfd_cell pointer, we can now
cleanly pass the sub device drivers platform data pointers through the
regular device platform_data one, and get rid of mfd_get_data()

Cc: Ian Molton <spyro@f2s.com>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Philipp Zabel <philipp.zabel@gmail.com>
Acked-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

parent a771e36e

drivers/mfd/asic3.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -777,7 +777,8 @@ static struct mfd_cell asic3_cell_mmc = {
	.name = "tmio-mmc",		.name = "tmio-mmc",
	.enable = asic3_mmc_enable,		.enable = asic3_mmc_enable,
	.disable = asic3_mmc_disable,		.disable = asic3_mmc_disable,
	.mfd_data = &asic3_mmc_data,		.platform_data = &asic3_mmc_data,
			.pdata_size = sizeof(asic3_mmc_data),
	.num_resources = ARRAY_SIZE(asic3_mmc_resources),		.num_resources = ARRAY_SIZE(asic3_mmc_resources),
	.resources = asic3_mmc_resources,		.resources = asic3_mmc_resources,
	};		};

drivers/mfd/t7l66xb.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -170,7 +170,8 @@ static struct mfd_cell t7l66xb_cells[] = {
	.name = "tmio-mmc",		.name = "tmio-mmc",
	.enable = t7l66xb_mmc_enable,		.enable = t7l66xb_mmc_enable,
	.disable = t7l66xb_mmc_disable,		.disable = t7l66xb_mmc_disable,
	.mfd_data = &t7166xb_mmc_data,		.platform_data = &t7166xb_mmc_data,
			.pdata_size = sizeof(t7166xb_mmc_data),
	.num_resources = ARRAY_SIZE(t7l66xb_mmc_resources),		.num_resources = ARRAY_SIZE(t7l66xb_mmc_resources),
	.resources = t7l66xb_mmc_resources,		.resources = t7l66xb_mmc_resources,
	},		},

drivers/mfd/tc6387xb.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -131,7 +131,8 @@ static struct mfd_cell tc6387xb_cells[] = {
	.name = "tmio-mmc",		.name = "tmio-mmc",
	.enable = tc6387xb_mmc_enable,		.enable = tc6387xb_mmc_enable,
	.disable = tc6387xb_mmc_disable,		.disable = tc6387xb_mmc_disable,
	.mfd_data = &tc6387xb_mmc_data,		.platform_data = &tc6387xb_mmc_data,
			.pdata_size = sizeof(tc6387xb_mmc_data),
	.num_resources = ARRAY_SIZE(tc6387xb_mmc_resources),		.num_resources = ARRAY_SIZE(tc6387xb_mmc_resources),
	.resources = tc6387xb_mmc_resources,		.resources = tc6387xb_mmc_resources,
	},		},

drivers/mfd/tc6393xb.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -393,7 +393,8 @@ static struct mfd_cell __devinitdata tc6393xb_cells[] = {
	.name = "tmio-mmc",		.name = "tmio-mmc",
	.enable = tc6393xb_mmc_enable,		.enable = tc6393xb_mmc_enable,
	.resume = tc6393xb_mmc_resume,		.resume = tc6393xb_mmc_resume,
	.mfd_data = &tc6393xb_mmc_data,		.platform_data = &tc6393xb_mmc_data,
			.pdata_size = sizeof(tc6393xb_mmc_data),
	.num_resources = ARRAY_SIZE(tc6393xb_mmc_resources),		.num_resources = ARRAY_SIZE(tc6393xb_mmc_resources),
	.resources = tc6393xb_mmc_resources,		.resources = tc6393xb_mmc_resources,
	},		},

drivers/mmc/host/tmio_mmc.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -69,7 +69,7 @@ static int __devinit tmio_mmc_probe(struct platform_device *pdev)
	if (pdev->num_resources != 2)		if (pdev->num_resources != 2)
	goto out;		goto out;

	pdata = mfd_get_data(pdev);		pdata = pdev->dev.platform_data;
	if (!pdata \|\| !pdata->hclk)		if (!pdata \|\| !pdata->hclk)
	goto out;		goto out;