[GIT PULL for 2.6.36] V4L/DVB fixes

[GIT PULL for 2.6.36] V4L/DVB fixes

[Mauro Carvalho Chehab]

Linus,

Please pull from:
  ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git v4l_for_linus

For 3 build fixes.

Cheers,
Mauro.

The following changes since commit ad41a1e0cab07c5125456e8d38e5b1ab148d04aa:

  Merge branch 'io_remap_pfn_range' of git://www.jni.nu/cris (2010-08-12 10:17:19 -0700)

are available in the git repository at:

  ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git v4l_for_linus

Mauro Carvalho Chehab (2):
      V4L/DVB: Fix IR_CORE dependencies
      V4L/DVB: fix Kconfig to depends on VIDEO_IR

Randy Dunlap (1):
      V4L/DVB: v4l2-ctrls.c: needs to include slab.h

 drivers/media/IR/Kconfig            |    9 ++++++++-
 drivers/media/dvb/dm1105/Kconfig    |    2 +-
 drivers/media/dvb/dvb-usb/Kconfig   |    2 +-
 drivers/media/dvb/siano/Kconfig     |    2 +-
 drivers/media/dvb/ttpci/Kconfig     |    2 +-
 drivers/media/video/bt8xx/Kconfig   |    2 +-
 drivers/media/video/cx18/Kconfig    |    2 +-
 drivers/media/video/cx231xx/Kconfig |    2 +-
 drivers/media/video/cx23885/Kconfig |    2 +-
 drivers/media/video/cx88/Kconfig    |    2 +-
 drivers/media/video/em28xx/Kconfig  |    2 +-
 drivers/media/video/ivtv/Kconfig    |    2 +-
 drivers/media/video/saa7134/Kconfig |    2 +-
 drivers/media/video/tlg2300/Kconfig |    2 +-
 drivers/media/video/v4l2-ctrls.c    |    1 +
 15 files changed, 22 insertions(+), 14 deletions(-)

[PATCH] V4L/DVB: mantis: Fix IR_CORE dependency

[Ingo Molnar]

* Mauro Carvalho Chehab <mchehab@redhat.com> wrote:

> Linus,
> 
> Please pull from:
>   ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git v4l_for_linus
> 
> For 3 build fixes.
> 
> Cheers,
> Mauro.
> 
> The following changes since commit ad41a1e0cab07c5125456e8d38e5b1ab148d04aa:
> 
>   Merge branch 'io_remap_pfn_range' of git://www.jni.nu/cris (2010-08-12 10:17:19 -0700)
> 
> are available in the git repository at:
> 
>   ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git v4l_for_linus
> 
> Mauro Carvalho Chehab (2):
>       V4L/DVB: Fix IR_CORE dependencies
>       V4L/DVB: fix Kconfig to depends on VIDEO_IR
> 
> Randy Dunlap (1):
>       V4L/DVB: v4l2-ctrls.c: needs to include slab.h

FYI, there's one more IR_CORE related build bug which triggers 
frequently in randconfig tests - see the fix below.

Thanks,

	Ingo

------------------->
>From c56aef270d7ec01564c632c1f7ebab6b8f9f032c Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 24 Aug 2010 10:41:33 +0200
Subject: [PATCH] V4L/DVB: mantis: Fix IR_CORE dependency

This build bug triggers:

 drivers/built-in.o: In function `mantis_exit':
 (.text+0x377413): undefined reference to `ir_input_unregister'
 drivers/built-in.o: In function `mantis_input_init':
 (.text+0x3774ff): undefined reference to `__ir_input_register'

If MANTIS_CORE is enabled but IR_CORE is not. Add the correct
dependency.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 drivers/media/dvb/mantis/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/media/dvb/mantis/Kconfig b/drivers/media/dvb/mantis/Kconfig
index decdeda..fd0830e 100644
--- a/drivers/media/dvb/mantis/Kconfig
+++ b/drivers/media/dvb/mantis/Kconfig
@@ -1,6 +1,6 @@
 config MANTIS_CORE
 	tristate "Mantis/Hopper PCI bridge based devices"
-	depends on PCI && I2C && INPUT
+	depends on PCI && I2C && INPUT && IR_CORE
 
 	help
 	  Support for PCI cards based on the Mantis and Hopper PCi bridge.

Re: [PATCH] V4L/DVB: mantis: Fix IR_CORE dependency

[Randy Dunlap]

On 08/24/10 01:45, Ingo Molnar wrote:
> 
> * Mauro Carvalho Chehab <mchehab@redhat.com> wrote:
> 
>> Linus,
>>
>> Please pull from:
>>   ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git v4l_for_linus
>>
>> For 3 build fixes.
>>
>> Cheers,
>> Mauro.
>>
>> The following changes since commit ad41a1e0cab07c5125456e8d38e5b1ab148d04aa:
>>
>>   Merge branch 'io_remap_pfn_range' of git://www.jni.nu/cris (2010-08-12 10:17:19 -0700)
>>
>> are available in the git repository at:
>>
>>   ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git v4l_for_linus
>>
>> Mauro Carvalho Chehab (2):
>>       V4L/DVB: Fix IR_CORE dependencies
>>       V4L/DVB: fix Kconfig to depends on VIDEO_IR
>>
>> Randy Dunlap (1):
>>       V4L/DVB: v4l2-ctrls.c: needs to include slab.h
> 
> FYI, there's one more IR_CORE related build bug which triggers 
> frequently in randconfig tests - see the fix below.
> 
> Thanks,
> 
> 	Ingo
> 
> ------------------->
> From c56aef270d7ec01564c632c1f7ebab6b8f9f032c Mon Sep 17 00:00:00 2001
> From: Ingo Molnar <mingo@elte.hu>
> Date: Tue, 24 Aug 2010 10:41:33 +0200
> Subject: [PATCH] V4L/DVB: mantis: Fix IR_CORE dependency
> 
> This build bug triggers:
> 
>  drivers/built-in.o: In function `mantis_exit':
>  (.text+0x377413): undefined reference to `ir_input_unregister'
>  drivers/built-in.o: In function `mantis_input_init':
>  (.text+0x3774ff): undefined reference to `__ir_input_register'
> 
> If MANTIS_CORE is enabled but IR_CORE is not. Add the correct
> dependency.
> 
> Signed-off-by: Ingo Molnar <mingo@elte.hu>
> ---
>  drivers/media/dvb/mantis/Kconfig |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/media/dvb/mantis/Kconfig b/drivers/media/dvb/mantis/Kconfig
> index decdeda..fd0830e 100644
> --- a/drivers/media/dvb/mantis/Kconfig
> +++ b/drivers/media/dvb/mantis/Kconfig
> @@ -1,6 +1,6 @@
>  config MANTIS_CORE
>  	tristate "Mantis/Hopper PCI bridge based devices"
> -	depends on PCI && I2C && INPUT
> +	depends on PCI && I2C && INPUT && IR_CORE
>  
>  	help
>  	  Support for PCI cards based on the Mantis and Hopper PCi bridge.


Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
http://lkml.org/lkml/2010/8/17/341

thanks,
-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: [PATCH] V4L/DVB: mantis: Fix IR_CORE dependency

[Ingo Molnar]

* Randy Dunlap <randy.dunlap@oracle.com> wrote:

> On 08/24/10 01:45, Ingo Molnar wrote:
> > 
> > * Mauro Carvalho Chehab <mchehab@redhat.com> wrote:
> > 
> >> Linus,
> >>
> >> Please pull from:
> >>   ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git v4l_for_linus
> >>
> >> For 3 build fixes.
> >>
> >> Cheers,
> >> Mauro.
> >>
> >> The following changes since commit ad41a1e0cab07c5125456e8d38e5b1ab148d04aa:
> >>
> >>   Merge branch 'io_remap_pfn_range' of git://www.jni.nu/cris (2010-08-12 10:17:19 -0700)
> >>
> >> are available in the git repository at:
> >>
> >>   ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git v4l_for_linus
> >>
> >> Mauro Carvalho Chehab (2):
> >>       V4L/DVB: Fix IR_CORE dependencies
> >>       V4L/DVB: fix Kconfig to depends on VIDEO_IR
> >>
> >> Randy Dunlap (1):
> >>       V4L/DVB: v4l2-ctrls.c: needs to include slab.h
> > 
> > FYI, there's one more IR_CORE related build bug which triggers 
> > frequently in randconfig tests - see the fix below.
> > 
> > Thanks,
> > 
> > 	Ingo
> > 
> > ------------------->
> > From c56aef270d7ec01564c632c1f7ebab6b8f9f032c Mon Sep 17 00:00:00 2001
> > From: Ingo Molnar <mingo@elte.hu>
> > Date: Tue, 24 Aug 2010 10:41:33 +0200
> > Subject: [PATCH] V4L/DVB: mantis: Fix IR_CORE dependency
> > 
> > This build bug triggers:
> > 
> >  drivers/built-in.o: In function `mantis_exit':
> >  (.text+0x377413): undefined reference to `ir_input_unregister'
> >  drivers/built-in.o: In function `mantis_input_init':
> >  (.text+0x3774ff): undefined reference to `__ir_input_register'
> > 
> > If MANTIS_CORE is enabled but IR_CORE is not. Add the correct
> > dependency.
> > 
> > Signed-off-by: Ingo Molnar <mingo@elte.hu>
> > ---
> >  drivers/media/dvb/mantis/Kconfig |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/drivers/media/dvb/mantis/Kconfig b/drivers/media/dvb/mantis/Kconfig
> > index decdeda..fd0830e 100644
> > --- a/drivers/media/dvb/mantis/Kconfig
> > +++ b/drivers/media/dvb/mantis/Kconfig
> > @@ -1,6 +1,6 @@
> >  config MANTIS_CORE
> >  	tristate "Mantis/Hopper PCI bridge based devices"
> > -	depends on PCI && I2C && INPUT
> > +	depends on PCI && I2C && INPUT && IR_CORE
> >  
> >  	help
> >  	  Support for PCI cards based on the Mantis and Hopper PCi bridge.
> 
> 
> Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
> http://lkml.org/lkml/2010/8/17/341

Your patch came first :-)

Btw., the reason i missed your patch is that i grepped lkml for the 
static build failure - while your changelog contained the modular one. 
Oh well :)

Thanks,

	Ingo

Re: [PATCH] V4L/DVB: mantis: Fix IR_CORE dependency

[Mauro Carvalho Chehab]

Em 24-08-2010 16:30, Ingo Molnar escreveu:
> 
> * Randy Dunlap <randy.dunlap@oracle.com> wrote:
> 
>> On 08/24/10 01:45, Ingo Molnar wrote:
>>>
>>> * Mauro Carvalho Chehab <mchehab@redhat.com> wrote:
>>>
>>>> Linus,
>>>>
>>>> Please pull from:
>>>>   ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git v4l_for_linus
>>>>
>>>> For 3 build fixes.
>>>>
>>>> Cheers,
>>>> Mauro.
>>>>
>>>> The following changes since commit ad41a1e0cab07c5125456e8d38e5b1ab148d04aa:
>>>>
>>>>   Merge branch 'io_remap_pfn_range' of git://www.jni.nu/cris (2010-08-12 10:17:19 -0700)
>>>>
>>>> are available in the git repository at:
>>>>
>>>>   ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git v4l_for_linus
>>>>
>>>> Mauro Carvalho Chehab (2):
>>>>       V4L/DVB: Fix IR_CORE dependencies
>>>>       V4L/DVB: fix Kconfig to depends on VIDEO_IR
>>>>
>>>> Randy Dunlap (1):
>>>>       V4L/DVB: v4l2-ctrls.c: needs to include slab.h
>>>
>>> FYI, there's one more IR_CORE related build bug which triggers 
>>> frequently in randconfig tests - see the fix below.
>>>
>>> Thanks,
>>>
>>> 	Ingo
>>>
>>> ------------------->
>>> From c56aef270d7ec01564c632c1f7ebab6b8f9f032c Mon Sep 17 00:00:00 2001
>>> From: Ingo Molnar <mingo@elte.hu>
>>> Date: Tue, 24 Aug 2010 10:41:33 +0200
>>> Subject: [PATCH] V4L/DVB: mantis: Fix IR_CORE dependency
>>>
>>> This build bug triggers:
>>>
>>>  drivers/built-in.o: In function `mantis_exit':
>>>  (.text+0x377413): undefined reference to `ir_input_unregister'
>>>  drivers/built-in.o: In function `mantis_input_init':
>>>  (.text+0x3774ff): undefined reference to `__ir_input_register'
>>>
>>> If MANTIS_CORE is enabled but IR_CORE is not. Add the correct
>>> dependency.
>>>
>>> Signed-off-by: Ingo Molnar <mingo@elte.hu>
>>> ---
>>>  drivers/media/dvb/mantis/Kconfig |    2 +-
>>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/drivers/media/dvb/mantis/Kconfig b/drivers/media/dvb/mantis/Kconfig
>>> index decdeda..fd0830e 100644
>>> --- a/drivers/media/dvb/mantis/Kconfig
>>> +++ b/drivers/media/dvb/mantis/Kconfig
>>> @@ -1,6 +1,6 @@
>>>  config MANTIS_CORE
>>>  	tristate "Mantis/Hopper PCI bridge based devices"
>>> -	depends on PCI && I2C && INPUT
>>> +	depends on PCI && I2C && INPUT && IR_CORE
>>>  
>>>  	help
>>>  	  Support for PCI cards based on the Mantis and Hopper PCi bridge.
>>
>>
>> Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
>> http://lkml.org/lkml/2010/8/17/341
> 
> Your patch came first :-)
> 
> Btw., the reason i missed your patch is that i grepped lkml for the 
> static build failure - while your changelog contained the modular one. 
> Oh well :)

I've added this patch earlier today on my tree:

http://git.linuxtv.org/media_tree.git?a=commit;h=3a057c36346f60bd0fb4fe7d7a68c4d931d8768f

and the other IR_CORE fixup at staging/tm6000:
http://git.linuxtv.org/media_tree.git?a=commit;h=926a2496438f44268130f72f5e102dcac484573d

I'll be sending them today to my linux-next tree and likely tomorrow to upstream,
together with a few other fixes.

> 
> Thanks,
> 
> 	Ingo

Re: [PATCH] V4L/DVB: mantis: Fix IR_CORE dependency

[Bjørn Mork]

I wonder, am I really the only one who find it somewhat strange that
it's necessary to break the mantis driver by doing changes to code which
is not used at all?  Yes, mantis_input.c may be linked into mantis_core,
so it is capable of breaking the build, but there is *nothing* calling
the code.

IMHO mantis_input.c should be removed unless it can be fixed up enough
to be enabled, but one would have to know why it was disabled in the
first place to do that.  Dead code can always be ressurrected later if
someone is willing to work on it.  This completely unnecessary
dependency bug gives you at least one good reason why keeping dead code
is bad.

(Keeping the code might have been considered if it was likely to be used
in the near future, but this is not the case given that you do not
currently accept any patches actually improving the mantis driver.)

It's not that this bug is so bad or nothing.  I'm just puzzled by your
development priorities, which is the direct cause of this bug.

Let me know if you are going to start accepting patches for the mantis
driver (the best way is by doing something with the patches already
posted), and I will prepare and test a patch removing mantis_input.c

Just my €0.02


Bjørn