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

Commit cb5811cf authored by Samuel Ortiz's avatar Samuel Ortiz
Browse files

mfd: Use mfd cell platform_data for davinci cells platform bits 



With the addition of a platform device mfd_cell pointer, MFD drivers
can go back to passing platform back to their sub drivers.
This allows for an mfd_cell->mfd_data removal and thus keep the
sub drivers MFD agnostic. This is mostly needed for non MFD aware
sub drivers.

Cc: Miguel Aguilar <miguel.aguilar@ridgerun.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 07259a70

drivers/mfd/davinci_voicecodec.c

+4 −2
Original line number Diff line number Diff line
@@ -119,12 +119,14 @@ static int __init davinci_vc_probe(struct platform_device *pdev) 
	/* Voice codec interface client */

	cell = &davinci_vc->cells[DAVINCI_VC_VCIF_CELL];

	cell->name = "davinci-vcif";

	cell->mfd_data = davinci_vc;

	cell->platform_data = davinci_vc;

	cell->pdata_size = sizeof(*davinci_vc);



	/* Voice codec CQ93VC client */

	cell = &davinci_vc->cells[DAVINCI_VC_CQ93VC_CELL];

	cell->name = "cq93vc-codec";

	cell->mfd_data = davinci_vc;

	cell->platform_data = davinci_vc;

	cell->pdata_size = sizeof(*davinci_vc);



	ret = mfd_add_devices(&pdev->dev, pdev->id, davinci_vc->cells,

			      DAVINCI_VC_CELLS, NULL, 0);

sound/soc/codecs/cq93vc.c

+1 −2
Original line number Diff line number Diff line
@@ -153,8 +153,7 @@ static int cq93vc_resume(struct snd_soc_codec *codec) 


static int cq93vc_probe(struct snd_soc_codec *codec)

{

	struct davinci_vc *davinci_vc =

			mfd_get_data(to_platform_device(codec->dev));

	struct davinci_vc *davinci_vc = codec->dev->platform_data;



	davinci_vc->cq93vc.codec = codec;

	codec->control_data = davinci_vc;

sound/soc/davinci/davinci-vcif.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static struct snd_soc_dai_driver davinci_vcif_dai = { 


static int davinci_vcif_probe(struct platform_device *pdev)

{

	struct davinci_vc *davinci_vc = mfd_get_data(pdev);

	struct davinci_vc *davinci_vc = pdev->dev.platform_data;

	struct davinci_vcif_dev *davinci_vcif_dev;

	int ret;