Re: SoC pxa2xx-ac97 + wm9705 + touchscreen suspend/resume

[Russell King - ARM Linux <linux@arm.linux.org.uk>]

On Thu, Apr 02, 2009 at 04:22:34PM +0100, Mark Brown wrote:
> On Thu, Apr 02, 2009 at 04:09:22PM +0100, Russell King - ARM Linux wrote:
> > On Thu, Apr 02, 2009 at 03:53:30PM +0100, Mark Brown wrote:
> 
> > > Compile tested only.
> 
> > I beg to disagree with that statement...
> 
> Sorry about that - spot the use of git commit --amend.
> 
> > Fixing these results in something which can be built, and along with
> > your other two for the soc-core resume and the ac97 device parent,
> > the complaints from the touchscreen driver no longer appear.
> 
> Excellent - I'll push the fixed patches to Takashi when he's back from
> vacation.  Thanks again for your work tracking this down.

I notice that the fixes were merged, minus one:

sound/soc/codecs/wm9705.c: At top level:
sound/soc/codecs/wm9705.c:445: warning: initialization from incompatible pointer type

so you might find this trivial patch useful.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c
index 6e23a81..c2d1a7a 100644
--- a/sound/soc/codecs/wm9705.c
+++ b/sound/soc/codecs/wm9705.c
@@ -318,7 +318,7 @@ static int wm9705_reset(struct snd_soc_codec *codec)
 }
 
 #ifdef CONFIG_PM
-static int wm9705_soc_suspend(struct platform_device *pdev)
+static int wm9705_soc_suspend(struct platform_device *pdev, pm_message_t msg)
 {
 	struct snd_soc_device *socdev = platform_get_drvdata(pdev);
 	struct snd_soc_codec *codec = socdev->card->codec;