ASoC: hdmi-codec: remove reference to the dai drivers in the private data

[sfrench/cifs-2.6.git] / sound / soc / codecs / hdmi-codec.c

diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c
index 4d32f93f6be686cc785bf126ffe4f0156b31fe1e..9408e6bc4d3e5415c08afe68fddaf014e7f4118a 100644 (file)
--- a/sound/soc/codecs/hdmi-codec.c
+++ b/sound/soc/codecs/hdmi-codec.c
@@ -278,7 +278,6 @@ static const struct hdmi_codec_cea_spk_alloc hdmi_codec_channel_alloc[] = {
 
 struct hdmi_codec_priv {
        struct hdmi_codec_pdata hcd;
-       struct snd_soc_dai_driver *daidrv;
        struct hdmi_codec_daifmt daifmt[2];
        uint8_t eld[MAX_ELD_BYTES];
        struct snd_pcm_chmap *chmap_info;
@@ -715,6 +714,7 @@ static const struct snd_soc_component_driver hdmi_driver = {
 static int hdmi_codec_probe(struct platform_device *pdev)
 {
        struct hdmi_codec_pdata *hcd = pdev->dev.platform_data;
+       struct snd_soc_dai_driver *daidrv;
        struct device *dev = &pdev->dev;
        struct hdmi_codec_priv *hcp;
        int dai_count, i = 0;
@@ -737,27 +737,25 @@ static int hdmi_codec_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        hcp->hcd = *hcd;
-       hcp->daidrv = devm_kcalloc(dev, dai_count, sizeof(*hcp->daidrv),
-                                  GFP_KERNEL);
-       if (!hcp->daidrv)
+       daidrv = devm_kcalloc(dev, dai_count, sizeof(*daidrv), GFP_KERNEL);
+       if (!daidrv)
                return -ENOMEM;
 
        if (hcd->i2s) {
-               hcp->daidrv[i] = hdmi_i2s_dai;
-               hcp->daidrv[i].playback.channels_max =
-                       hcd->max_i2s_channels;
+               daidrv[i] = hdmi_i2s_dai;
+               daidrv[i].playback.channels_max = hcd->max_i2s_channels;
                i++;
        }
 
        if (hcd->spdif) {
-               hcp->daidrv[i] = hdmi_spdif_dai;
+               daidrv[i] = hdmi_spdif_dai;
                hcp->daifmt[DAI_ID_SPDIF].fmt = HDMI_SPDIF;
        }
 
        dev_set_drvdata(dev, hcp);
 
-       ret = devm_snd_soc_register_component(dev, &hdmi_driver, hcp->daidrv,
-                                    dai_count);
+       ret = devm_snd_soc_register_component(dev, &hdmi_driver, daidrv,
+                                             dai_count);
        if (ret) {
                dev_err(dev, "%s: snd_soc_register_component() failed (%d)\n",
                        __func__, ret);