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

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

asoc: davinci_voicecodec: use mfd_data instead of driver_data 



Use mfd_data for passing information from mfd drivers to soc
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().

Signed-off-by: default avatarAndres Salomon <dilinger@queued.net>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 65e52359

drivers/mfd/davinci_voicecodec.c

+2 −2
Original line number Diff line number Diff line
@@ -119,12 +119,12 @@ 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->driver_data = davinci_vc;

	cell->mfd_data = davinci_vc;



	/* Voice codec CQ93VC client */

	cell = &davinci_vc->cells[DAVINCI_VC_CQ93VC_CELL];

	cell->name = "cq93vc-codec";

	cell->driver_data = davinci_vc;

	cell->mfd_data = davinci_vc;



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

			      DAVINCI_VC_CELLS, NULL, 0);

sound/soc/codecs/cq93vc.c

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


static int cq93vc_probe(struct snd_soc_codec *codec)

{

	struct davinci_vc *davinci_vc = snd_soc_codec_get_drvdata(codec);

	struct davinci_vc *davinci_vc =

			mfd_get_data(to_platform_device(codec->dev));



	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 = platform_get_drvdata(pdev);

	struct davinci_vc *davinci_vc = mfd_get_data(pdev);

	struct davinci_vcif_dev *davinci_vcif_dev;

	int ret;