[PATCH] sst: fix compile error

[PATCH] sst: fix compile error

[Lu Guanqun]

Add several include files to fix the below compile error.

drivers/staging/intel_sst/intelmid.c: In function ‘snd_intelmad_sst_register’:
drivers/staging/intel_sst/intelmid.c:612:2: error: ‘sst_drv_ctx’ undeclared (first use in this function)
drivers/staging/intel_sst/intelmid.c:612:2: note: each undeclared identifier is reported only once for each function it appears in

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
---
 drivers/staging/intel_sst/intelmid.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/staging/intel_sst/intelmid.c b/drivers/staging/intel_sst/intelmid.c
index 32ded14..bbda30f 100644
--- a/drivers/staging/intel_sst/intelmid.c
+++ b/drivers/staging/intel_sst/intelmid.c
@@ -37,8 +37,11 @@
 #include <sound/pcm_params.h>
 #include <sound/initval.h>
 #include <linux/gpio.h>
+#include <linux/firmware.h>
 #include "intel_sst.h"
 #include "intel_sst_ioctl.h"
+#include "intel_sst_fw_ipc.h"
+#include "intel_sst_common.h"
 #include "intelmid_snd_control.h"
 #include "intelmid_adc_control.h"
 #include "intelmid.h"

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH] sst: fix compile error

[Mark Brown]

On Thu, Apr 07, 2011 at 10:18:13AM +0800, Lu Guanqun wrote:
> Add several include files to fix the below compile error.
> 
> drivers/staging/intel_sst/intelmid.c: In function ‘snd_intelmad_sst_register’:
> drivers/staging/intel_sst/intelmid.c:612:2: error: ‘sst_drv_ctx’ undeclared (first use in this function)
> drivers/staging/intel_sst/intelmid.c:612:2: note: each undeclared identifier is reported only once for each function it appears in
> 
> Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>

Is this needed in 2.6.39?  Greg, I'm happy to take this through ASoC if
you're OK with that.

> ---
>  drivers/staging/intel_sst/intelmid.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/staging/intel_sst/intelmid.c b/drivers/staging/intel_sst/intelmid.c
> index 32ded14..bbda30f 100644
> --- a/drivers/staging/intel_sst/intelmid.c
> +++ b/drivers/staging/intel_sst/intelmid.c
> @@ -37,8 +37,11 @@
>  #include <sound/pcm_params.h>
>  #include <sound/initval.h>
>  #include <linux/gpio.h>
> +#include <linux/firmware.h>
>  #include "intel_sst.h"
>  #include "intel_sst_ioctl.h"
> +#include "intel_sst_fw_ipc.h"
> +#include "intel_sst_common.h"
>  #include "intelmid_snd_control.h"
>  #include "intelmid_adc_control.h"
>  #include "intelmid.h"
> 
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH] sst: fix compile error

[Lu Guanqun]

On Thu, Apr 07, 2011 at 02:27:18PM +0800, Mark Brown wrote:
> On Thu, Apr 07, 2011 at 10:18:13AM +0800, Lu Guanqun wrote:
> > Add several include files to fix the below compile error.
> > 
> > drivers/staging/intel_sst/intelmid.c: In function ‘snd_intelmad_sst_register’:
> > drivers/staging/intel_sst/intelmid.c:612:2: error: ‘sst_drv_ctx’ undeclared (first use in this function)
> > drivers/staging/intel_sst/intelmid.c:612:2: note: each undeclared identifier is reported only once for each function it appears in
> > 
> > Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
> 
> Is this needed in 2.6.39?  Greg, I'm happy to take this through ASoC if
> you're OK with that.

Hi Mark,

This isn't needed for 2.6.39.

This compile error is actually caused by my fault, see below commit.

commit 0ed625b2f2751c249417bd28694e37ef48eb5fbb
Author: Lu Guanqun <guanqun.lu@intel.com>
Date:   Wed Apr 6 10:20:42 2011 +0800

    sst: make register_sst_card more self-contained
    
    register_sst_card is used in ASoC code with field `scard_ops` being NULL.
    Without this patch, there will be NULL dereference.
    
    Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

And this commit is only in your branch for-2.6.40. I failed to add
CONFIG_INTELMID=y in my previous test, so this error is hidden.

> 
> > ---
> >  drivers/staging/intel_sst/intelmid.c |    3 +++
> >  1 files changed, 3 insertions(+), 0 deletions(-)
> > 
> > diff --git a/drivers/staging/intel_sst/intelmid.c b/drivers/staging/intel_sst/intelmid.c
> > index 32ded14..bbda30f 100644
> > --- a/drivers/staging/intel_sst/intelmid.c
> > +++ b/drivers/staging/intel_sst/intelmid.c
> > @@ -37,8 +37,11 @@
> >  #include <sound/pcm_params.h>
> >  #include <sound/initval.h>
> >  #include <linux/gpio.h>
> > +#include <linux/firmware.h>
> >  #include "intel_sst.h"
> >  #include "intel_sst_ioctl.h"
> > +#include "intel_sst_fw_ipc.h"
> > +#include "intel_sst_common.h"
> >  #include "intelmid_snd_control.h"
> >  #include "intelmid_adc_control.h"
> >  #include "intelmid.h"
> > 

-- 
guanqun
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH] sst: fix compile error

[Mark Brown]

On Thu, Apr 07, 2011 at 02:44:20PM +0800, Lu Guanqun wrote:

> This compile error is actually caused by my fault, see below commit.

Ah, OK, it's a change I've applied in my tree that introduces the issue
- I'll apply your fix next time I run through patches.

Re: [PATCH] sst: fix compile error

[Lu Guanqun]

On Thu, Apr 07, 2011 at 03:50:31PM +0800, Mark Brown wrote:
> On Thu, Apr 07, 2011 at 02:44:20PM +0800, Lu Guanqun wrote:
> 
> > This compile error is actually caused by my fault, see below commit.
> 
> Ah, OK, it's a change I've applied in my tree that introduces the issue
> - I'll apply your fix next time I run through patches.

Thanks. Later when I'm sending patches, I'll try to clarify which kernel
tree I'm based on...

-- 
guanqun

Re: [PATCH] sst: fix compile error

[Mark Brown]

On Thu, Apr 07, 2011 at 10:18:13AM +0800, Lu Guanqun wrote:
> Add several include files to fix the below compile error.
> 
> drivers/staging/intel_sst/intelmid.c: In function ‘snd_intelmad_sst_register’:
> drivers/staging/intel_sst/intelmid.c:612:2: error: ‘sst_drv_ctx’ undeclared (first use in this function)
> drivers/staging/intel_sst/intelmid.c:612:2: note: each undeclared identifier is reported only once for each function it appears in

This does not apply against my for-2.6.40 branch - please check which
tree it should be applied against.
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH] sst: fix compile error

[Lu Guanqun]

On Fri, Apr 08, 2011 at 08:21:15AM +0800, Mark Brown wrote:
> On Thu, Apr 07, 2011 at 10:18:13AM +0800, Lu Guanqun wrote:
> > Add several include files to fix the below compile error.
> > 
> > drivers/staging/intel_sst/intelmid.c: In function ‘snd_intelmad_sst_register’:
> > drivers/staging/intel_sst/intelmid.c:612:2: error: ‘sst_drv_ctx’ undeclared (first use in this function)
> > drivers/staging/intel_sst/intelmid.c:612:2: note: each undeclared identifier is reported only once for each function it appears in
> 
> This does not apply against my for-2.6.40 branch - please check which
> tree it should be applied against.

Hi Mark,

I've resent the patch based on your 2.6.40 branch. Please check. It can
be applied cleanly. The reason is I mixes several kernel trees together
and the other has changes in this intelmid.c file.

Sorry for the trouble.

-- 
guanqun
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel