[PATCH] ASoC: Amstrad Delta: fix const related build error

[PATCH] ASoC: Amstrad Delta: fix const related build error

[Janusz Krzysztofik]

The Amstrad Delta ASoC driver used to override the digital_mute() 
callback, expected to be not provided by the on-board CX20442 CODEC 
driver, with its own implementation. While this is still posssible when 
substituting the whole empty snd_soc_dai_driver.ops member (the CX20442 
case), replacing snd_soc_dai_ops.digital_mute only is no longer correct 
after the snd_soc_dai_driver.ops member has been constified, and results 
in build error.

Drop this actually not used code path in hope the CX20442 driver never 
provides its own snd_soc_dai_ops structure.

Created and tested against linux-2.6.38-rc2

Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
---
Please consider queuing this patch for the current rc cycle.

 sound/soc/omap/ams-delta.c |    2 --
 1 file changed, 2 deletions(-)

--- git/sound/soc/omap/ams-delta.c.orig	2011-01-31 19:49:29.000000000 
+0100
+++ git/sound/soc/omap/ams-delta.c	2011-01-31 23:24:45.000000000 +0100
@@ -507,8 +507,6 @@ static int ams_delta_cx20442_init(struct
 	/* Set up digital mute if not provided by the codec */
 	if (!codec_dai->driver->ops) {
 		codec_dai->driver->ops = &ams_delta_dai_ops;
-	} else if (!codec_dai->driver->ops->digital_mute) {
-		codec_dai->driver->ops->digital_mute = ams_delta_digital_mute;
 	} else {
 		ams_delta_ops.startup = ams_delta_startup;
 		ams_delta_ops.shutdown = ams_delta_shutdown;

[Resend] [PATCH] ASoC: Amstrad Delta: fix const related build error

[Janusz Krzysztofik]

The Amstrad Delta ASoC driver used to override the digital_mute() 
callback, expected to be not provided by the on-board CX20442 CODEC 
driver, with its own implementation. While this is still posssible when 
substituting the whole empty snd_soc_dai_driver.ops member (the CX20442 
case), replacing snd_soc_dai_ops.digital_mute only is no longer correct 
after the snd_soc_dai_driver.ops member has been constified, and results 
in build error.

Drop this actually not used code path in hope the CX20442 driver never 
provides its own snd_soc_dai_ops structure.

Created and tested against linux-2.6.38-rc2

Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
---
Resending because of line wrap, sorry.
Please consider queuing this patch for the current rc cycle.

 sound/soc/omap/ams-delta.c |    2 --
 1 file changed, 2 deletions(-)

--- git/sound/soc/omap/ams-delta.c.orig	2011-01-31 19:49:29.000000000 +0100
+++ git/sound/soc/omap/ams-delta.c	2011-01-31 23:24:45.000000000 +0100
@@ -507,8 +507,6 @@ static int ams_delta_cx20442_init(struct
 	/* Set up digital mute if not provided by the codec */
 	if (!codec_dai->driver->ops) {
 		codec_dai->driver->ops = &ams_delta_dai_ops;
-	} else if (!codec_dai->driver->ops->digital_mute) {
-		codec_dai->driver->ops->digital_mute = ams_delta_digital_mute;
 	} else {
 		ams_delta_ops.startup = ams_delta_startup;
 		ams_delta_ops.shutdown = ams_delta_shutdown;

Re: [Resend] [PATCH] ASoC: Amstrad Delta: fix const related build error

[Liam Girdwood]

On Tue, 2011-02-01 at 11:11 +0100, Janusz Krzysztofik wrote:
> The Amstrad Delta ASoC driver used to override the digital_mute() 
> callback, expected to be not provided by the on-board CX20442 CODEC 
> driver, with its own implementation. While this is still posssible when 
> substituting the whole empty snd_soc_dai_driver.ops member (the CX20442 
> case), replacing snd_soc_dai_ops.digital_mute only is no longer correct 
> after the snd_soc_dai_driver.ops member has been constified, and results 
> in build error.
> 
> Drop this actually not used code path in hope the CX20442 driver never 
> provides its own snd_soc_dai_ops structure.
> 
> Created and tested against linux-2.6.38-rc2
> 
> Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
> ---
> Resending because of line wrap, sorry.
> Please consider queuing this patch for the current rc cycle.
> 

Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk

Re: [Resend] [PATCH] ASoC: Amstrad Delta: fix const related build error

[Mark Brown]

On Tue, Feb 01, 2011 at 11:11:55AM +0100, Janusz Krzysztofik wrote:
> The Amstrad Delta ASoC driver used to override the digital_mute() 
> callback, expected to be not provided by the on-board CX20442 CODEC 
> driver, with its own implementation. While this is still posssible when 

Applied, thanks.