gspca/kinect: wrap gspca_debug with GSPCA_DEBUG

Message ID 20110526084912.1ac3ac37@tele (mailing list archive)
State Superseded, archived
Headers

Commit Message

Jean-Francois Moine May 26, 2011, 6:49 a.m. UTC
  On Wed, 25 May 2011 17:34:32 -0400
Jarod Wilson <jarod@redhat.com> wrote:

> diff --git a/drivers/media/video/gspca/kinect.c b/drivers/media/video/gspca/kinect.c
> index 66671a4..26fc206 100644
> --- a/drivers/media/video/gspca/kinect.c
> +++ b/drivers/media/video/gspca/kinect.c
> @@ -34,7 +34,7 @@ MODULE_AUTHOR("Antonio Ospite <ospite@studenti.unina.it>");
>  MODULE_DESCRIPTION("GSPCA/Kinect Sensor Device USB Camera Driver");
>  MODULE_LICENSE("GPL");
>  
> -#ifdef DEBUG
> +#ifdef GSPCA_DEBUG
>  int gspca_debug = D_ERR | D_PROBE | D_CONF | D_STREAM | D_FRAM | D_PACK |
>  	D_USBI | D_USBO | D_V4L2;
>  #endif

Hi Jarod,

Sorry, it is not the right fix. In fact, the variable gspca_debug must
not be defined in gspca subdrivers:
  

Comments

Antonio Ospite May 26, 2011, 7:47 a.m. UTC | #1
On Thu, 26 May 2011 08:49:12 +0200
Jean-Francois Moine <moinejf@free.fr> wrote:

> On Wed, 25 May 2011 17:34:32 -0400
> Jarod Wilson <jarod@redhat.com> wrote:
> 
> > diff --git a/drivers/media/video/gspca/kinect.c b/drivers/media/video/gspca/kinect.c
> > index 66671a4..26fc206 100644
> > --- a/drivers/media/video/gspca/kinect.c
> > +++ b/drivers/media/video/gspca/kinect.c
> > @@ -34,7 +34,7 @@ MODULE_AUTHOR("Antonio Ospite <ospite@studenti.unina.it>");
> >  MODULE_DESCRIPTION("GSPCA/Kinect Sensor Device USB Camera Driver");
> >  MODULE_LICENSE("GPL");
> >  
> > -#ifdef DEBUG
> > +#ifdef GSPCA_DEBUG
> >  int gspca_debug = D_ERR | D_PROBE | D_CONF | D_STREAM | D_FRAM | D_PACK |
> >  	D_USBI | D_USBO | D_V4L2;
> >  #endif
> 
> Hi Jarod,
> 
> Sorry, it is not the right fix. In fact, the variable gspca_debug must
> not be defined in gspca subdrivers:
> 
> --- a/drivers/media/video/gspca/kinect.c
> +++ b/drivers/media/video/gspca/kinect.c
> @@ -34,11 +34,6 @@
>  MODULE_DESCRIPTION("GSPCA/Kinect Sensor Device USB Camera Driver");
>  MODULE_LICENSE("GPL");
>  
> -#ifdef DEBUG
> -int gspca_debug = D_ERR | D_PROBE | D_CONF | D_STREAM | D_FRAM | D_PACK |
> -	D_USBI | D_USBO | D_V4L2;
> -#endif
> -
>  struct pkt_hdr {
>  	uint8_t magic[2];
>  	uint8_t pad;
> 

OK.

Thanks,
   Antonio
  
Jarod Wilson May 26, 2011, 1:48 p.m. UTC | #2
On May 26, 2011, at 2:49 AM, jean-francois Moine wrote:

> On Wed, 25 May 2011 17:34:32 -0400
> Jarod Wilson <jarod@redhat.com> wrote:
> 
>> diff --git a/drivers/media/video/gspca/kinect.c b/drivers/media/video/gspca/kinect.c
>> index 66671a4..26fc206 100644
>> --- a/drivers/media/video/gspca/kinect.c
>> +++ b/drivers/media/video/gspca/kinect.c
>> @@ -34,7 +34,7 @@ MODULE_AUTHOR("Antonio Ospite <ospite@studenti.unina.it>");
>> MODULE_DESCRIPTION("GSPCA/Kinect Sensor Device USB Camera Driver");
>> MODULE_LICENSE("GPL");
>> 
>> -#ifdef DEBUG
>> +#ifdef GSPCA_DEBUG
>> int gspca_debug = D_ERR | D_PROBE | D_CONF | D_STREAM | D_FRAM | D_PACK |
>> 	D_USBI | D_USBO | D_V4L2;
>> #endif
> 
> Hi Jarod,
> 
> Sorry, it is not the right fix. In fact, the variable gspca_debug must
> not be defined in gspca subdrivers:
> 
> --- a/drivers/media/video/gspca/kinect.c
> +++ b/drivers/media/video/gspca/kinect.c
> @@ -34,11 +34,6 @@
> MODULE_DESCRIPTION("GSPCA/Kinect Sensor Device USB Camera Driver");
> MODULE_LICENSE("GPL");
> 
> -#ifdef DEBUG
> -int gspca_debug = D_ERR | D_PROBE | D_CONF | D_STREAM | D_FRAM | D_PACK |
> -	D_USBI | D_USBO | D_V4L2;
> -#endif
> -
> struct pkt_hdr {
> 	uint8_t magic[2];
> 	uint8_t pad;

Ah, ok, that works just as well for me, since I don't have the hardware,
was just looking to make sure things still complied. ;)
  

Patch

--- a/drivers/media/video/gspca/kinect.c
+++ b/drivers/media/video/gspca/kinect.c
@@ -34,11 +34,6 @@ 
 MODULE_DESCRIPTION("GSPCA/Kinect Sensor Device USB Camera Driver");
 MODULE_LICENSE("GPL");
 
-#ifdef DEBUG
-int gspca_debug = D_ERR | D_PROBE | D_CONF | D_STREAM | D_FRAM | D_PACK |
-	D_USBI | D_USBO | D_V4L2;
-#endif
-
 struct pkt_hdr {
 	uint8_t magic[2];
 	uint8_t pad;