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

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

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

sound/soc/codecs/hdmi-codec.c

+8 −10
Original line number Diff line number Diff line
@@ -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,26 +737,24 @@ 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,

	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",