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: Andres Salomon <dilinger@queued.net> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
parent
65e523595a
commit
d57763370e
|
@ -119,12 +119,12 @@ static int __init davinci_vc_probe(struct platform_device *pdev)
|
||||||
/* Voice codec interface client */
|
/* Voice codec interface client */
|
||||||
cell = &davinci_vc->cells[DAVINCI_VC_VCIF_CELL];
|
cell = &davinci_vc->cells[DAVINCI_VC_VCIF_CELL];
|
||||||
cell->name = "davinci-vcif";
|
cell->name = "davinci-vcif";
|
||||||
cell->driver_data = davinci_vc;
|
cell->mfd_data = davinci_vc;
|
||||||
|
|
||||||
/* Voice codec CQ93VC client */
|
/* Voice codec CQ93VC client */
|
||||||
cell = &davinci_vc->cells[DAVINCI_VC_CQ93VC_CELL];
|
cell = &davinci_vc->cells[DAVINCI_VC_CQ93VC_CELL];
|
||||||
cell->name = "cq93vc-codec";
|
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,
|
ret = mfd_add_devices(&pdev->dev, pdev->id, davinci_vc->cells,
|
||||||
DAVINCI_VC_CELLS, NULL, 0);
|
DAVINCI_VC_CELLS, NULL, 0);
|
||||||
|
|
|
@ -153,7 +153,8 @@ static int cq93vc_resume(struct snd_soc_codec *codec)
|
||||||
|
|
||||||
static int cq93vc_probe(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;
|
davinci_vc->cq93vc.codec = codec;
|
||||||
codec->control_data = davinci_vc;
|
codec->control_data = davinci_vc;
|
||||||
|
|
|
@ -205,7 +205,7 @@ static struct snd_soc_dai_driver davinci_vcif_dai = {
|
||||||
|
|
||||||
static int davinci_vcif_probe(struct platform_device *pdev)
|
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;
|
struct davinci_vcif_dev *davinci_vcif_dev;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue