Commit d4d9820b authored Dec 28, 2011 by Axel Lin Committed by Mark Brown Dec 28, 2011

ASoC: Fix build error in sound/soc/kirkwood/kirkwood-i2s.c



Since commit db33f4de "ARM: Orion: Remove address map info from all platform data structures",
the dram is removed from struct kirkwood_asoc_platform_data.

This patch fixes below build error:
  CC      sound/soc/kirkwood/kirkwood-i2s.o
sound/soc/kirkwood/kirkwood-i2s.c: In function 'kirkwood_i2s_dev_probe':
sound/soc/kirkwood/kirkwood-i2s.c:444: error: 'struct kirkwood_asoc_platform_data' has no member named 'dram'
sound/soc/kirkwood/kirkwood-i2s.c:450: error: 'struct kirkwood_asoc_platform_data' has no member named 'dram'
make[3]: *** [sound/soc/kirkwood/kirkwood-i2s.o] Error 1
make[2]: *** [sound/soc/kirkwood] Error 2
make[1]: *** [sound/soc] Error 2
make: *** [sound] Error 2

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent 6ab7e71a

sound/soc/kirkwood/kirkwood-i2s.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -441,13 +441,12 @@ static __devinit int kirkwood_i2s_dev_probe(struct platform_device *pdev)
		goto err_ioremap;
		}

		if (!data \|\| !data->dram) {
		if (!data) {
		dev_err(&pdev->dev, "no platform data ?!\n");
		err = -EINVAL;
		goto err_ioremap;
		}

		priv->dram = data->dram;
		priv->burst = data->burst;

		return snd_soc_register_dai(&pdev->dev, &kirkwood_i2s_dai);

sound/soc/kirkwood/kirkwood.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -123,7 +123,6 @@ struct kirkwood_dma_data {
		void __iomem *io;
		int irq;
		int burst;
		struct mbus_dram_target_info *dram;
		};

		#endif