Commit 1de005d4 authored by Jerome Brunet's avatar Jerome Brunet Committed by Mark Brown

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

Keeping the a pointer to the dai drivers is not necessary. It is not used
by the hdmi_codec after the probe.

Even if it was used, the 'struct snd_soc_dai_driver' can accessed through
the 'struct snd_soc_dai' so keeping the pointer in the private data
structure is not useful.
Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3fcf94ef
...@@ -278,7 +278,6 @@ static const struct hdmi_codec_cea_spk_alloc hdmi_codec_channel_alloc[] = { ...@@ -278,7 +278,6 @@ static const struct hdmi_codec_cea_spk_alloc hdmi_codec_channel_alloc[] = {
struct hdmi_codec_priv { struct hdmi_codec_priv {
struct hdmi_codec_pdata hcd; struct hdmi_codec_pdata hcd;
struct snd_soc_dai_driver *daidrv;
struct hdmi_codec_daifmt daifmt[2]; struct hdmi_codec_daifmt daifmt[2];
uint8_t eld[MAX_ELD_BYTES]; uint8_t eld[MAX_ELD_BYTES];
struct snd_pcm_chmap *chmap_info; struct snd_pcm_chmap *chmap_info;
...@@ -715,6 +714,7 @@ static const struct snd_soc_component_driver hdmi_driver = { ...@@ -715,6 +714,7 @@ static const struct snd_soc_component_driver hdmi_driver = {
static int hdmi_codec_probe(struct platform_device *pdev) static int hdmi_codec_probe(struct platform_device *pdev)
{ {
struct hdmi_codec_pdata *hcd = pdev->dev.platform_data; struct hdmi_codec_pdata *hcd = pdev->dev.platform_data;
struct snd_soc_dai_driver *daidrv;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct hdmi_codec_priv *hcp; struct hdmi_codec_priv *hcp;
int dai_count, i = 0; int dai_count, i = 0;
...@@ -737,26 +737,24 @@ static int hdmi_codec_probe(struct platform_device *pdev) ...@@ -737,26 +737,24 @@ static int hdmi_codec_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
hcp->hcd = *hcd; hcp->hcd = *hcd;
hcp->daidrv = devm_kcalloc(dev, dai_count, sizeof(*hcp->daidrv), daidrv = devm_kcalloc(dev, dai_count, sizeof(*daidrv), GFP_KERNEL);
GFP_KERNEL); if (!daidrv)
if (!hcp->daidrv)
return -ENOMEM; return -ENOMEM;
if (hcd->i2s) { if (hcd->i2s) {
hcp->daidrv[i] = hdmi_i2s_dai; daidrv[i] = hdmi_i2s_dai;
hcp->daidrv[i].playback.channels_max = daidrv[i].playback.channels_max = hcd->max_i2s_channels;
hcd->max_i2s_channels;
i++; i++;
} }
if (hcd->spdif) { if (hcd->spdif) {
hcp->daidrv[i] = hdmi_spdif_dai; daidrv[i] = hdmi_spdif_dai;
hcp->daifmt[DAI_ID_SPDIF].fmt = HDMI_SPDIF; hcp->daifmt[DAI_ID_SPDIF].fmt = HDMI_SPDIF;
} }
dev_set_drvdata(dev, hcp); dev_set_drvdata(dev, hcp);
ret = devm_snd_soc_register_component(dev, &hdmi_driver, hcp->daidrv, ret = devm_snd_soc_register_component(dev, &hdmi_driver, daidrv,
dai_count); dai_count);
if (ret) { if (ret) {
dev_err(dev, "%s: snd_soc_register_component() failed (%d)\n", dev_err(dev, "%s: snd_soc_register_component() failed (%d)\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment