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

Commit 4f95bf40 authored by Andres Salomon's avatar Andres Salomon Committed by Samuel Ortiz
Browse files

mmc: Use mfd_data instead of driver_data for tmio-mmc 



Use mfd_data for passing information from mfd drivers to mfd
clients.  The mfd_cell's driver_data field is being phased out.

Clients that were using driver_data now access .mfd_data
via mfd_get_data().  This changes tmio-mmc only; mfd drivers with
other cells are not modified.

Signed-off-by: default avatarAndres Salomon <dilinger@queued.net>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent fcd67979

drivers/mfd/asic3.c

+1 −1
Original line number Diff line number Diff line
@@ -783,7 +783,7 @@ static struct mfd_cell asic3_cell_mmc = { 
	.name          = "tmio-mmc",

	.enable        = asic3_mmc_enable,

	.disable       = asic3_mmc_disable,

	.driver_data   = &asic3_mmc_data,

	.mfd_data      = &asic3_mmc_data,

	.num_resources = ARRAY_SIZE(asic3_mmc_resources),

	.resources     = asic3_mmc_resources,

};

drivers/mfd/sh_mobile_sdhi.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev) 
	}



	memcpy(&priv->cell_mmc, &sh_mobile_sdhi_cell, sizeof(priv->cell_mmc));

	priv->cell_mmc.driver_data = mmc_data;

	priv->cell_mmc.mfd_data = mmc_data;



	platform_set_drvdata(pdev, priv);

drivers/mfd/t7l66xb.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static struct mfd_cell t7l66xb_cells[] = { 
		.name = "tmio-mmc",

		.enable = t7l66xb_mmc_enable,

		.disable = t7l66xb_mmc_disable,

		.driver_data = &t7166xb_mmc_data,

		.mfd_data = &t7166xb_mmc_data,

		.num_resources = ARRAY_SIZE(t7l66xb_mmc_resources),

		.resources = t7l66xb_mmc_resources,

	},

drivers/mfd/tc6387xb.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static struct mfd_cell tc6387xb_cells[] = { 
		.name = "tmio-mmc",

		.enable = tc6387xb_mmc_enable,

		.disable = tc6387xb_mmc_disable,

		.driver_data = &tc6387xb_mmc_data,

		.mfd_data = &tc6387xb_mmc_data,

		.num_resources = ARRAY_SIZE(tc6387xb_mmc_resources),

		.resources = tc6387xb_mmc_resources,

	},

drivers/mfd/tc6393xb.c

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static struct mfd_cell __devinitdata tc6393xb_cells[] = { 
		.name = "tmio-mmc",

		.enable = tc6393xb_mmc_enable,

		.resume = tc6393xb_mmc_resume,

		.driver_data = &tc6393xb_mmc_data,

		.mfd_data = &tc6393xb_mmc_data,

		.num_resources = ARRAY_SIZE(tc6393xb_mmc_resources),

		.resources = tc6393xb_mmc_resources,

	},