* Re: linux-next: Tree for July 28 (lirc) [not found] <20100728162855.4968e561.sfr@canb.auug.org.au> @ 2010-07-28 17:13 ` Randy Dunlap 2010-07-29 15:35 ` [PATCH] staging/lirc: fix non-CONFIG_MODULES build horkage Jarod Wilson 2010-07-28 17:24 ` linux-next: Tree for July 28 (lirc #2) Randy Dunlap 1 sibling, 1 reply; 11+ messages in thread From: Randy Dunlap @ 2010-07-28 17:13 UTC (permalink / raw) To: Stephen Rothwell, lirc-list, Jarod Wilson Cc: linux-next, LKML, Maxim Levitsky, linux-media, Mauro Carvalho Chehab On Wed, 28 Jul 2010 16:28:55 +1000 Stephen Rothwell wrote: > Hi all, > > Changes since 20100727: when CONFIG_MODULES is not enabled: drivers/staging/lirc/lirc_parallel.c:243: error: implicit declaration of function 'module_refcount' drivers/staging/lirc/lirc_it87.c:150: error: implicit declaration of function 'module_refcount' drivers/built-in.o: In function `it87_probe': lirc_it87.c:(.text+0x4079b0): undefined reference to `init_chrdev' lirc_it87.c:(.text+0x4079cc): undefined reference to `drop_chrdev' drivers/built-in.o: In function `lirc_it87_exit': lirc_it87.c:(.exit.text+0x38a5): undefined reference to `drop_chrdev' --- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] staging/lirc: fix non-CONFIG_MODULES build horkage 2010-07-28 17:13 ` linux-next: Tree for July 28 (lirc) Randy Dunlap @ 2010-07-29 15:35 ` Jarod Wilson 2010-07-29 16:24 ` Randy Dunlap 0 siblings, 1 reply; 11+ messages in thread From: Jarod Wilson @ 2010-07-29 15:35 UTC (permalink / raw) To: Randy Dunlap Cc: sfr, lirc-list, linux-next, linux-kernel, linux-media, mchehab Fix when CONFIG_MODULES is not enabled: drivers/staging/lirc/lirc_parallel.c:243: error: implicit declaration of function 'module_refcount' drivers/staging/lirc/lirc_it87.c:150: error: implicit declaration of function 'module_refcount' drivers/built-in.o: In function `it87_probe': lirc_it87.c:(.text+0x4079b0): undefined reference to `init_chrdev' lirc_it87.c:(.text+0x4079cc): undefined reference to `drop_chrdev' drivers/built-in.o: In function `lirc_it87_exit': lirc_it87.c:(.exit.text+0x38a5): undefined reference to `drop_chrdev' Its a quick hack and untested beyond building, since I don't have the hardware, but it should do the trick. Signed-off-by: Jarod Wilson <jarod@redhat.com> --- drivers/staging/lirc/lirc_it87.c | 9 ++++++--- drivers/staging/lirc/lirc_parallel.c | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/staging/lirc/lirc_it87.c b/drivers/staging/lirc/lirc_it87.c index 781abc3..72f07f1 100644 --- a/drivers/staging/lirc/lirc_it87.c +++ b/drivers/staging/lirc/lirc_it87.c @@ -109,6 +109,7 @@ static DECLARE_WAIT_QUEUE_HEAD(lirc_read_queue); static DEFINE_SPINLOCK(hardware_lock); static DEFINE_SPINLOCK(dev_lock); +static bool device_open; static int rx_buf[RBUF_LEN]; unsigned int rx_tail, rx_head; @@ -147,10 +148,11 @@ static void drop_port(void); static int lirc_open(struct inode *inode, struct file *file) { spin_lock(&dev_lock); - if (module_refcount(THIS_MODULE)) { + if (device_open) { spin_unlock(&dev_lock); return -EBUSY; } + device_open = true; spin_unlock(&dev_lock); return 0; } @@ -158,6 +160,9 @@ static int lirc_open(struct inode *inode, struct file *file) static int lirc_close(struct inode *inode, struct file *file) { + spin_lock(&dev_lock); + device_open = false; + spin_unlock(&dev_lock); return 0; } @@ -363,7 +368,6 @@ static struct lirc_driver driver = { }; -#ifdef MODULE static int init_chrdev(void) { driver.minor = lirc_register_driver(&driver); @@ -380,7 +384,6 @@ static void drop_chrdev(void) { lirc_unregister_driver(driver.minor); } -#endif /* SECTION: Hardware */ diff --git a/drivers/staging/lirc/lirc_parallel.c b/drivers/staging/lirc/lirc_parallel.c index df12e7b..04ce97713 100644 --- a/drivers/staging/lirc/lirc_parallel.c +++ b/drivers/staging/lirc/lirc_parallel.c @@ -240,7 +240,7 @@ static void irq_handler(void *blah) unsigned int level, newlevel; unsigned int timeout; - if (!module_refcount(THIS_MODULE)) + if (!is_open) return; if (!is_claimed) @@ -515,7 +515,7 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) static int lirc_open(struct inode *node, struct file *filep) { - if (module_refcount(THIS_MODULE) || !lirc_claim()) + if (is_open || !lirc_claim()) return -EBUSY; parport_enable_irq(pport); -- Jarod Wilson jarod@redhat.com ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH] staging/lirc: fix non-CONFIG_MODULES build horkage 2010-07-29 15:35 ` [PATCH] staging/lirc: fix non-CONFIG_MODULES build horkage Jarod Wilson @ 2010-07-29 16:24 ` Randy Dunlap 0 siblings, 0 replies; 11+ messages in thread From: Randy Dunlap @ 2010-07-29 16:24 UTC (permalink / raw) To: Jarod Wilson Cc: sfr, lirc-list, linux-next, linux-kernel, linux-media, mchehab On 07/29/10 08:35, Jarod Wilson wrote: > Fix when CONFIG_MODULES is not enabled: > > drivers/staging/lirc/lirc_parallel.c:243: error: implicit declaration of function 'module_refcount' > drivers/staging/lirc/lirc_it87.c:150: error: implicit declaration of function 'module_refcount' > drivers/built-in.o: In function `it87_probe': > lirc_it87.c:(.text+0x4079b0): undefined reference to `init_chrdev' > lirc_it87.c:(.text+0x4079cc): undefined reference to `drop_chrdev' > drivers/built-in.o: In function `lirc_it87_exit': > lirc_it87.c:(.exit.text+0x38a5): undefined reference to `drop_chrdev' > > Its a quick hack and untested beyond building, since I don't have the > hardware, but it should do the trick. > > Signed-off-by: Jarod Wilson <jarod@redhat.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Thanks. > --- > drivers/staging/lirc/lirc_it87.c | 9 ++++++--- > drivers/staging/lirc/lirc_parallel.c | 4 ++-- > 2 files changed, 8 insertions(+), 5 deletions(-) > > diff --git a/drivers/staging/lirc/lirc_it87.c b/drivers/staging/lirc/lirc_it87.c > index 781abc3..72f07f1 100644 > --- a/drivers/staging/lirc/lirc_it87.c > +++ b/drivers/staging/lirc/lirc_it87.c > @@ -109,6 +109,7 @@ static DECLARE_WAIT_QUEUE_HEAD(lirc_read_queue); > > static DEFINE_SPINLOCK(hardware_lock); > static DEFINE_SPINLOCK(dev_lock); > +static bool device_open; > > static int rx_buf[RBUF_LEN]; > unsigned int rx_tail, rx_head; > @@ -147,10 +148,11 @@ static void drop_port(void); > static int lirc_open(struct inode *inode, struct file *file) > { > spin_lock(&dev_lock); > - if (module_refcount(THIS_MODULE)) { > + if (device_open) { > spin_unlock(&dev_lock); > return -EBUSY; > } > + device_open = true; > spin_unlock(&dev_lock); > return 0; > } > @@ -158,6 +160,9 @@ static int lirc_open(struct inode *inode, struct file *file) > > static int lirc_close(struct inode *inode, struct file *file) > { > + spin_lock(&dev_lock); > + device_open = false; > + spin_unlock(&dev_lock); > return 0; > } > > @@ -363,7 +368,6 @@ static struct lirc_driver driver = { > }; > > > -#ifdef MODULE > static int init_chrdev(void) > { > driver.minor = lirc_register_driver(&driver); > @@ -380,7 +384,6 @@ static void drop_chrdev(void) > { > lirc_unregister_driver(driver.minor); > } > -#endif > > > /* SECTION: Hardware */ > diff --git a/drivers/staging/lirc/lirc_parallel.c b/drivers/staging/lirc/lirc_parallel.c > index df12e7b..04ce97713 100644 > --- a/drivers/staging/lirc/lirc_parallel.c > +++ b/drivers/staging/lirc/lirc_parallel.c > @@ -240,7 +240,7 @@ static void irq_handler(void *blah) > unsigned int level, newlevel; > unsigned int timeout; > > - if (!module_refcount(THIS_MODULE)) > + if (!is_open) > return; > > if (!is_claimed) > @@ -515,7 +515,7 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) > > static int lirc_open(struct inode *node, struct file *filep) > { > - if (module_refcount(THIS_MODULE) || !lirc_claim()) > + if (is_open || !lirc_claim()) > return -EBUSY; > > parport_enable_irq(pport); > > -- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: linux-next: Tree for July 28 (lirc #2) [not found] <20100728162855.4968e561.sfr@canb.auug.org.au> 2010-07-28 17:13 ` linux-next: Tree for July 28 (lirc) Randy Dunlap @ 2010-07-28 17:24 ` Randy Dunlap 2010-07-28 22:04 ` Janne Grunau 1 sibling, 1 reply; 11+ messages in thread From: Randy Dunlap @ 2010-07-28 17:24 UTC (permalink / raw) To: Stephen Rothwell, lirc-list, Jarod Wilson Cc: linux-next, LKML, Maxim Levitsky, linux-media, Mauro Carvalho Chehab On Wed, 28 Jul 2010 16:28:55 +1000 Stephen Rothwell wrote: > Hi all, > > Changes since 20100727: When USB_SUPPORT is not enabled and MEDIA_SUPPORT is not enabled: ERROR: "lirc_dev_fop_close" [drivers/staging/lirc/lirc_streamzap.ko] undefined! ERROR: "lirc_dev_fop_open" [drivers/staging/lirc/lirc_streamzap.ko] undefined! ERROR: "lirc_dev_fop_poll" [drivers/staging/lirc/lirc_streamzap.ko] undefined! ERROR: "lirc_dev_fop_write" [drivers/staging/lirc/lirc_streamzap.ko] undefined! ERROR: "lirc_dev_fop_read" [drivers/staging/lirc/lirc_streamzap.ko] undefined! ERROR: "usb_register_driver" [drivers/staging/lirc/lirc_streamzap.ko] undefined! ERROR: "lirc_register_driver" [drivers/staging/lirc/lirc_streamzap.ko] undefined! ERROR: "usb_string" [drivers/staging/lirc/lirc_streamzap.ko] undefined! ERROR: "usb_alloc_urb" [drivers/staging/lirc/lirc_streamzap.ko] undefined! ERROR: "usb_alloc_coherent" [drivers/staging/lirc/lirc_streamzap.ko] undefined! ERROR: "lirc_dev_fop_ioctl" [drivers/staging/lirc/lirc_streamzap.ko] undefined! ERROR: "lirc_get_pdata" [drivers/staging/lirc/lirc_streamzap.ko] undefined! ERROR: "usb_free_coherent" [drivers/staging/lirc/lirc_streamzap.ko] undefined! ERROR: "usb_free_urb" [drivers/staging/lirc/lirc_streamzap.ko] undefined! ERROR: "lirc_unregister_driver" [drivers/staging/lirc/lirc_streamzap.ko] undefined! ERROR: "usb_kill_urb" [drivers/staging/lirc/lirc_streamzap.ko] undefined! ERROR: "usb_submit_urb" [drivers/staging/lirc/lirc_streamzap.ko] undefined! ERROR: "usb_deregister" [drivers/staging/lirc/lirc_streamzap.ko] undefined! ERROR: "lirc_dev_fop_close" [drivers/staging/lirc/lirc_sir.ko] undefined! ERROR: "lirc_dev_fop_open" [drivers/staging/lirc/lirc_sir.ko] undefined! ERROR: "lirc_register_driver" [drivers/staging/lirc/lirc_sir.ko] undefined! ERROR: "lirc_unregister_driver" [drivers/staging/lirc/lirc_sir.ko] undefined! --- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: linux-next: Tree for July 28 (lirc #2) 2010-07-28 17:24 ` linux-next: Tree for July 28 (lirc #2) Randy Dunlap @ 2010-07-28 22:04 ` Janne Grunau 2010-07-28 22:16 ` Randy Dunlap 0 siblings, 1 reply; 11+ messages in thread From: Janne Grunau @ 2010-07-28 22:04 UTC (permalink / raw) To: Randy Dunlap Cc: Stephen Rothwell, lirc-list, Jarod Wilson, linux-next, LKML, Maxim Levitsky, linux-media, Mauro Carvalho Chehab On Wed, Jul 28, 2010 at 10:24:17AM -0700, Randy Dunlap wrote: > On Wed, 28 Jul 2010 16:28:55 +1000 Stephen Rothwell wrote: > > > Hi all, > > > > Changes since 20100727: > > > When USB_SUPPORT is not enabled and MEDIA_SUPPORT is not enabled: > following patch should fix it Janne >From 7d1cc98c19a6c27dd74a28f04dfe4248a0b335ce Mon Sep 17 00:00:00 2001 From: Janne Grunau <j@jannau.net> Date: Wed, 28 Jul 2010 23:53:35 +0200 Subject: [PATCH 1/2] staging/lirc: fix Kconfig dependencies Signed-off-by: Janne Grunau <j@jannau.net> --- drivers/staging/lirc/Kconfig | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/staging/lirc/Kconfig b/drivers/staging/lirc/Kconfig index 968c2ade..3981a4a 100644 --- a/drivers/staging/lirc/Kconfig +++ b/drivers/staging/lirc/Kconfig @@ -13,13 +13,13 @@ if LIRC_STAGING config LIRC_BT829 tristate "BT829 based hardware" - depends on LIRC_STAGING + depends on LIRC && LIRC_STAGING help Driver for the IR interface on BT829-based hardware config LIRC_ENE0100 tristate "ENE KB3924/ENE0100 CIR Port Reciever" - depends on LIRC_STAGING + depends on LIRC && LIRC_STAGING help This is a driver for CIR port handled by ENE KB3924 embedded controller found on some notebooks. @@ -27,20 +27,20 @@ config LIRC_ENE0100 config LIRC_I2C tristate "I2C Based IR Receivers" - depends on LIRC_STAGING + depends on I2C && LIRC && LIRC_STAGING help Driver for I2C-based IR receivers, such as those commonly found onboard Hauppauge PVR-150/250/350 video capture cards config LIRC_IGORPLUGUSB tristate "Igor Cesko's USB IR Receiver" - depends on LIRC_STAGING && USB + depends on USB && LIRC && LIRC_STAGING && USB help Driver for Igor Cesko's USB IR Receiver config LIRC_IMON tristate "Legacy SoundGraph iMON Receiver and Display" - depends on LIRC_STAGING + depends on LIRC && LIRC_STAGING help Driver for the original SoundGraph iMON IR Receiver and Display @@ -48,31 +48,31 @@ config LIRC_IMON config LIRC_IT87 tristate "ITE IT87XX CIR Port Receiver" - depends on LIRC_STAGING + depends on LIRC && LIRC_STAGING help Driver for the ITE IT87xx IR Receiver config LIRC_ITE8709 tristate "ITE8709 CIR Port Receiver" - depends on LIRC_STAGING && PNP + depends on LIRC && LIRC_STAGING && PNP help Driver for the ITE8709 IR Receiver config LIRC_PARALLEL tristate "Homebrew Parallel Port Receiver" - depends on LIRC_STAGING && !SMP + depends on LIRC && LIRC_STAGING && !SMP help Driver for Homebrew Parallel Port Receivers config LIRC_SASEM tristate "Sasem USB IR Remote" - depends on LIRC_STAGING + depends on USB && LIRC && LIRC_STAGING help Driver for the Sasem OnAir Remocon-V or Dign HV5 HTPC IR/VFD Module config LIRC_SERIAL tristate "Homebrew Serial Port Receiver" - depends on LIRC_STAGING + depends on LIRC && LIRC_STAGING help Driver for Homebrew Serial Port Receivers @@ -85,25 +85,25 @@ config LIRC_SERIAL_TRANSMITTER config LIRC_SIR tristate "Built-in SIR IrDA port" - depends on LIRC_STAGING + depends on LIRC && LIRC_STAGING help Driver for the SIR IrDA port config LIRC_STREAMZAP tristate "Streamzap PC Receiver" - depends on LIRC_STAGING + depends on USB && LIRC && LIRC_STAGING help Driver for the Streamzap PC Receiver config LIRC_TTUSBIR tristate "Technotrend USB IR Receiver" - depends on LIRC_STAGING && USB + depends on USB && LIRC && LIRC_STAGING && USB help Driver for the Technotrend USB IR Receiver config LIRC_ZILOG tristate "Zilog/Hauppauge IR Transmitter" - depends on LIRC_STAGING + depends on I2C && LIRC && LIRC_STAGING help Driver for the Zilog/Hauppauge IR Transmitter, found on PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards -- 1.7.2 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: linux-next: Tree for July 28 (lirc #2) 2010-07-28 22:04 ` Janne Grunau @ 2010-07-28 22:16 ` Randy Dunlap 2010-07-28 22:27 ` Jarod Wilson 0 siblings, 1 reply; 11+ messages in thread From: Randy Dunlap @ 2010-07-28 22:16 UTC (permalink / raw) To: Janne Grunau Cc: Stephen Rothwell, lirc-list, Jarod Wilson, linux-next, LKML, Maxim Levitsky, linux-media, Mauro Carvalho Chehab On 07/28/10 15:04, Janne Grunau wrote: > On Wed, Jul 28, 2010 at 10:24:17AM -0700, Randy Dunlap wrote: >> On Wed, 28 Jul 2010 16:28:55 +1000 Stephen Rothwell wrote: >> >>> Hi all, >>> >>> Changes since 20100727: >> >> >> When USB_SUPPORT is not enabled and MEDIA_SUPPORT is not enabled: >> > > following patch should fix it > > Janne Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Thanks. > > From 7d1cc98c19a6c27dd74a28f04dfe4248a0b335ce Mon Sep 17 00:00:00 2001 > From: Janne Grunau <j@jannau.net> > Date: Wed, 28 Jul 2010 23:53:35 +0200 > Subject: [PATCH 1/2] staging/lirc: fix Kconfig dependencies > > Signed-off-by: Janne Grunau <j@jannau.net> > --- > drivers/staging/lirc/Kconfig | 28 ++++++++++++++-------------- > 1 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/drivers/staging/lirc/Kconfig b/drivers/staging/lirc/Kconfig > index 968c2ade..3981a4a 100644 > --- a/drivers/staging/lirc/Kconfig > +++ b/drivers/staging/lirc/Kconfig > @@ -13,13 +13,13 @@ if LIRC_STAGING > > config LIRC_BT829 > tristate "BT829 based hardware" > - depends on LIRC_STAGING > + depends on LIRC && LIRC_STAGING > help > Driver for the IR interface on BT829-based hardware > > config LIRC_ENE0100 > tristate "ENE KB3924/ENE0100 CIR Port Reciever" > - depends on LIRC_STAGING > + depends on LIRC && LIRC_STAGING > help > This is a driver for CIR port handled by ENE KB3924 embedded > controller found on some notebooks. > @@ -27,20 +27,20 @@ config LIRC_ENE0100 > > config LIRC_I2C > tristate "I2C Based IR Receivers" > - depends on LIRC_STAGING > + depends on I2C && LIRC && LIRC_STAGING > help > Driver for I2C-based IR receivers, such as those commonly > found onboard Hauppauge PVR-150/250/350 video capture cards > > config LIRC_IGORPLUGUSB > tristate "Igor Cesko's USB IR Receiver" > - depends on LIRC_STAGING && USB > + depends on USB && LIRC && LIRC_STAGING && USB > help > Driver for Igor Cesko's USB IR Receiver > > config LIRC_IMON > tristate "Legacy SoundGraph iMON Receiver and Display" > - depends on LIRC_STAGING > + depends on LIRC && LIRC_STAGING > help > Driver for the original SoundGraph iMON IR Receiver and Display > > @@ -48,31 +48,31 @@ config LIRC_IMON > > config LIRC_IT87 > tristate "ITE IT87XX CIR Port Receiver" > - depends on LIRC_STAGING > + depends on LIRC && LIRC_STAGING > help > Driver for the ITE IT87xx IR Receiver > > config LIRC_ITE8709 > tristate "ITE8709 CIR Port Receiver" > - depends on LIRC_STAGING && PNP > + depends on LIRC && LIRC_STAGING && PNP > help > Driver for the ITE8709 IR Receiver > > config LIRC_PARALLEL > tristate "Homebrew Parallel Port Receiver" > - depends on LIRC_STAGING && !SMP > + depends on LIRC && LIRC_STAGING && !SMP > help > Driver for Homebrew Parallel Port Receivers > > config LIRC_SASEM > tristate "Sasem USB IR Remote" > - depends on LIRC_STAGING > + depends on USB && LIRC && LIRC_STAGING > help > Driver for the Sasem OnAir Remocon-V or Dign HV5 HTPC IR/VFD Module > > config LIRC_SERIAL > tristate "Homebrew Serial Port Receiver" > - depends on LIRC_STAGING > + depends on LIRC && LIRC_STAGING > help > Driver for Homebrew Serial Port Receivers > > @@ -85,25 +85,25 @@ config LIRC_SERIAL_TRANSMITTER > > config LIRC_SIR > tristate "Built-in SIR IrDA port" > - depends on LIRC_STAGING > + depends on LIRC && LIRC_STAGING > help > Driver for the SIR IrDA port > > config LIRC_STREAMZAP > tristate "Streamzap PC Receiver" > - depends on LIRC_STAGING > + depends on USB && LIRC && LIRC_STAGING > help > Driver for the Streamzap PC Receiver > > config LIRC_TTUSBIR > tristate "Technotrend USB IR Receiver" > - depends on LIRC_STAGING && USB > + depends on USB && LIRC && LIRC_STAGING && USB > help > Driver for the Technotrend USB IR Receiver > > config LIRC_ZILOG > tristate "Zilog/Hauppauge IR Transmitter" > - depends on LIRC_STAGING > + depends on I2C && LIRC && LIRC_STAGING > help > Driver for the Zilog/Hauppauge IR Transmitter, found on > PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards -- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: linux-next: Tree for July 28 (lirc #2) 2010-07-28 22:16 ` Randy Dunlap @ 2010-07-28 22:27 ` Jarod Wilson 2010-07-29 4:27 ` Jarod Wilson 0 siblings, 1 reply; 11+ messages in thread From: Jarod Wilson @ 2010-07-28 22:27 UTC (permalink / raw) To: Randy Dunlap Cc: Janne Grunau, Stephen Rothwell, lirc-list, linux-next, LKML, Maxim Levitsky, linux-media, Mauro Carvalho Chehab On Wed, Jul 28, 2010 at 6:16 PM, Randy Dunlap <randy.dunlap@oracle.com> wrote: > On 07/28/10 15:04, Janne Grunau wrote: >> On Wed, Jul 28, 2010 at 10:24:17AM -0700, Randy Dunlap wrote: >>> On Wed, 28 Jul 2010 16:28:55 +1000 Stephen Rothwell wrote: >>> >>>> Hi all, >>>> >>>> Changes since 20100727: >>> >>> >>> When USB_SUPPORT is not enabled and MEDIA_SUPPORT is not enabled: >>> >> >> following patch should fix it >> >> Janne > > Acked-by: Randy Dunlap <randy.dunlap@oracle.com> > > Thanks. Acked-by: Jarod Wilson <jarod@redhat.com> Indeed, thanks much, Janne! >> From 7d1cc98c19a6c27dd74a28f04dfe4248a0b335ce Mon Sep 17 00:00:00 2001 >> From: Janne Grunau <j@jannau.net> >> Date: Wed, 28 Jul 2010 23:53:35 +0200 >> Subject: [PATCH 1/2] staging/lirc: fix Kconfig dependencies >> >> Signed-off-by: Janne Grunau <j@jannau.net> >> --- >> drivers/staging/lirc/Kconfig | 28 ++++++++++++++-------------- >> 1 files changed, 14 insertions(+), 14 deletions(-) >> >> diff --git a/drivers/staging/lirc/Kconfig b/drivers/staging/lirc/Kconfig >> index 968c2ade..3981a4a 100644 >> --- a/drivers/staging/lirc/Kconfig >> +++ b/drivers/staging/lirc/Kconfig >> @@ -13,13 +13,13 @@ if LIRC_STAGING >> >> config LIRC_BT829 >> tristate "BT829 based hardware" >> - depends on LIRC_STAGING >> + depends on LIRC && LIRC_STAGING >> help >> Driver for the IR interface on BT829-based hardware >> >> config LIRC_ENE0100 >> tristate "ENE KB3924/ENE0100 CIR Port Reciever" >> - depends on LIRC_STAGING >> + depends on LIRC && LIRC_STAGING >> help >> This is a driver for CIR port handled by ENE KB3924 embedded >> controller found on some notebooks. >> @@ -27,20 +27,20 @@ config LIRC_ENE0100 >> >> config LIRC_I2C >> tristate "I2C Based IR Receivers" >> - depends on LIRC_STAGING >> + depends on I2C && LIRC && LIRC_STAGING >> help >> Driver for I2C-based IR receivers, such as those commonly >> found onboard Hauppauge PVR-150/250/350 video capture cards >> >> config LIRC_IGORPLUGUSB >> tristate "Igor Cesko's USB IR Receiver" >> - depends on LIRC_STAGING && USB >> + depends on USB && LIRC && LIRC_STAGING && USB >> help >> Driver for Igor Cesko's USB IR Receiver >> >> config LIRC_IMON >> tristate "Legacy SoundGraph iMON Receiver and Display" >> - depends on LIRC_STAGING >> + depends on LIRC && LIRC_STAGING >> help >> Driver for the original SoundGraph iMON IR Receiver and Display >> >> @@ -48,31 +48,31 @@ config LIRC_IMON >> >> config LIRC_IT87 >> tristate "ITE IT87XX CIR Port Receiver" >> - depends on LIRC_STAGING >> + depends on LIRC && LIRC_STAGING >> help >> Driver for the ITE IT87xx IR Receiver >> >> config LIRC_ITE8709 >> tristate "ITE8709 CIR Port Receiver" >> - depends on LIRC_STAGING && PNP >> + depends on LIRC && LIRC_STAGING && PNP >> help >> Driver for the ITE8709 IR Receiver >> >> config LIRC_PARALLEL >> tristate "Homebrew Parallel Port Receiver" >> - depends on LIRC_STAGING && !SMP >> + depends on LIRC && LIRC_STAGING && !SMP >> help >> Driver for Homebrew Parallel Port Receivers >> >> config LIRC_SASEM >> tristate "Sasem USB IR Remote" >> - depends on LIRC_STAGING >> + depends on USB && LIRC && LIRC_STAGING >> help >> Driver for the Sasem OnAir Remocon-V or Dign HV5 HTPC IR/VFD Module >> >> config LIRC_SERIAL >> tristate "Homebrew Serial Port Receiver" >> - depends on LIRC_STAGING >> + depends on LIRC && LIRC_STAGING >> help >> Driver for Homebrew Serial Port Receivers >> >> @@ -85,25 +85,25 @@ config LIRC_SERIAL_TRANSMITTER >> >> config LIRC_SIR >> tristate "Built-in SIR IrDA port" >> - depends on LIRC_STAGING >> + depends on LIRC && LIRC_STAGING >> help >> Driver for the SIR IrDA port >> >> config LIRC_STREAMZAP >> tristate "Streamzap PC Receiver" >> - depends on LIRC_STAGING >> + depends on USB && LIRC && LIRC_STAGING >> help >> Driver for the Streamzap PC Receiver >> >> config LIRC_TTUSBIR >> tristate "Technotrend USB IR Receiver" >> - depends on LIRC_STAGING && USB >> + depends on USB && LIRC && LIRC_STAGING && USB >> help >> Driver for the Technotrend USB IR Receiver >> >> config LIRC_ZILOG >> tristate "Zilog/Hauppauge IR Transmitter" >> - depends on LIRC_STAGING >> + depends on I2C && LIRC && LIRC_STAGING >> help >> Driver for the Zilog/Hauppauge IR Transmitter, found on >> PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards > > > -- > ~Randy > *** Remember to use Documentation/SubmitChecklist when testing your code *** > -- Jarod Wilson jarod@wilsonet.com ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: linux-next: Tree for July 28 (lirc #2) 2010-07-28 22:27 ` Jarod Wilson @ 2010-07-29 4:27 ` Jarod Wilson 2010-07-29 12:39 ` Janne Grunau 0 siblings, 1 reply; 11+ messages in thread From: Jarod Wilson @ 2010-07-29 4:27 UTC (permalink / raw) To: Randy Dunlap Cc: Janne Grunau, Stephen Rothwell, lirc-list, linux-next, LKML, Maxim Levitsky, linux-media, Mauro Carvalho Chehab On Wed, Jul 28, 2010 at 6:27 PM, Jarod Wilson <jarod@wilsonet.com> wrote: > On Wed, Jul 28, 2010 at 6:16 PM, Randy Dunlap <randy.dunlap@oracle.com> wrote: >> On 07/28/10 15:04, Janne Grunau wrote: >>> On Wed, Jul 28, 2010 at 10:24:17AM -0700, Randy Dunlap wrote: >>>> On Wed, 28 Jul 2010 16:28:55 +1000 Stephen Rothwell wrote: >>>> >>>>> Hi all, >>>>> >>>>> Changes since 20100727: >>>> >>>> >>>> When USB_SUPPORT is not enabled and MEDIA_SUPPORT is not enabled: >>>> >>> >>> following patch should fix it >>> >>> Janne >> >> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> >> >> Thanks. > > Acked-by: Jarod Wilson <jarod@redhat.com> > > Indeed, thanks much, Janne! D'oh, I should have looked a bit closer... What if instead of making all the drivers depend on both LIRC && LIRC_STAGING, LIRC_STAGING just depends on LIRC? And there are a few depends lines with duplicate USB's in them and LIRC_IMON should have USB added to it (technically, I think ene0100 should also have a PNP, but we already have patches pending that move it from staging to an ir-core driver). -- Jarod Wilson jarod@wilsonet.com ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: linux-next: Tree for July 28 (lirc #2) 2010-07-29 4:27 ` Jarod Wilson @ 2010-07-29 12:39 ` Janne Grunau 2010-07-29 15:11 ` Jarod Wilson 2010-07-29 16:25 ` Randy Dunlap 0 siblings, 2 replies; 11+ messages in thread From: Janne Grunau @ 2010-07-29 12:39 UTC (permalink / raw) To: Jarod Wilson Cc: Randy Dunlap, Stephen Rothwell, lirc-list, linux-next, LKML, Maxim Levitsky, linux-media, Mauro Carvalho Chehab On Thu, Jul 29, 2010 at 12:27:01AM -0400, Jarod Wilson wrote: > On Wed, Jul 28, 2010 at 6:27 PM, Jarod Wilson <jarod@wilsonet.com> wrote: > > On Wed, Jul 28, 2010 at 6:16 PM, Randy Dunlap <randy.dunlap@oracle.com> wrote: > >> On 07/28/10 15:04, Janne Grunau wrote: > >>> On Wed, Jul 28, 2010 at 10:24:17AM -0700, Randy Dunlap wrote: > >>>> On Wed, 28 Jul 2010 16:28:55 +1000 Stephen Rothwell wrote: > >>>> > >>>>> Hi all, > >>>>> > >>>>> Changes since 20100727: > >>>> > >>>> > >>>> When USB_SUPPORT is not enabled and MEDIA_SUPPORT is not enabled: > >>>> > >>> > >>> following patch should fix it > >>> > >>> Janne > >> > >> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> > >> > >> Thanks. > > > > Acked-by: Jarod Wilson <jarod@redhat.com> > > > > Indeed, thanks much, Janne! > > D'oh, I should have looked a bit closer... What if instead of making > all the drivers depend on both LIRC && LIRC_STAGING, LIRC_STAGING just > depends on LIRC? I started adding LIRC to each driver by one. Adding LIRC as LIRC_STAGING dependency is simpler. See updated patch. > And there are a few depends lines with duplicate > USB's in them and LIRC_IMON should have USB added to it (technically, D'oh, I've must have stopped reading after LIRC_STAG... fixed and added additional dependencies Janne >From 45d384de90e3709a986700db14888eff77bb7e1f Mon Sep 17 00:00:00 2001 From: Janne Grunau <j@jannau.net> Date: Wed, 28 Jul 2010 23:53:35 +0200 Subject: [PATCH 1/2] V4L/DVB: staging/lirc: fix Kconfig dependencies Signed-off-by: Janne Grunau <j@jannau.net> --- drivers/staging/lirc/Kconfig | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/staging/lirc/Kconfig b/drivers/staging/lirc/Kconfig index 968c2ade..ab30a09 100644 --- a/drivers/staging/lirc/Kconfig +++ b/drivers/staging/lirc/Kconfig @@ -3,6 +3,7 @@ # menuconfig LIRC_STAGING bool "Linux Infrared Remote Control IR receiver/transmitter drivers" + depends on LIRC help Say Y here, and all supported Linux Infrared Remote Control IR and RF receiver and transmitter drivers will be displayed. When paired @@ -13,13 +14,13 @@ if LIRC_STAGING config LIRC_BT829 tristate "BT829 based hardware" - depends on LIRC_STAGING + depends on LIRC_STAGING && PCI help Driver for the IR interface on BT829-based hardware config LIRC_ENE0100 tristate "ENE KB3924/ENE0100 CIR Port Reciever" - depends on LIRC_STAGING + depends on LIRC_STAGING && PNP help This is a driver for CIR port handled by ENE KB3924 embedded controller found on some notebooks. @@ -27,7 +28,7 @@ config LIRC_ENE0100 config LIRC_I2C tristate "I2C Based IR Receivers" - depends on LIRC_STAGING + depends on LIRC_STAGING && I2C help Driver for I2C-based IR receivers, such as those commonly found onboard Hauppauge PVR-150/250/350 video capture cards @@ -40,7 +41,7 @@ config LIRC_IGORPLUGUSB config LIRC_IMON tristate "Legacy SoundGraph iMON Receiver and Display" - depends on LIRC_STAGING + depends on LIRC_STAGING && USB help Driver for the original SoundGraph iMON IR Receiver and Display @@ -48,7 +49,7 @@ config LIRC_IMON config LIRC_IT87 tristate "ITE IT87XX CIR Port Receiver" - depends on LIRC_STAGING + depends on LIRC_STAGING && PNP help Driver for the ITE IT87xx IR Receiver @@ -60,13 +61,13 @@ config LIRC_ITE8709 config LIRC_PARALLEL tristate "Homebrew Parallel Port Receiver" - depends on LIRC_STAGING && !SMP + depends on LIRC_STAGING && PARPORT && !SMP help Driver for Homebrew Parallel Port Receivers config LIRC_SASEM tristate "Sasem USB IR Remote" - depends on LIRC_STAGING + depends on LIRC_STAGING && USB help Driver for the Sasem OnAir Remocon-V or Dign HV5 HTPC IR/VFD Module @@ -91,7 +92,7 @@ config LIRC_SIR config LIRC_STREAMZAP tristate "Streamzap PC Receiver" - depends on LIRC_STAGING + depends on LIRC_STAGING && USB help Driver for the Streamzap PC Receiver @@ -103,7 +104,7 @@ config LIRC_TTUSBIR config LIRC_ZILOG tristate "Zilog/Hauppauge IR Transmitter" - depends on LIRC_STAGING + depends on LIRC_STAGING && I2C help Driver for the Zilog/Hauppauge IR Transmitter, found on PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards -- 1.7.2 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: linux-next: Tree for July 28 (lirc #2) 2010-07-29 12:39 ` Janne Grunau @ 2010-07-29 15:11 ` Jarod Wilson 2010-07-29 16:25 ` Randy Dunlap 1 sibling, 0 replies; 11+ messages in thread From: Jarod Wilson @ 2010-07-29 15:11 UTC (permalink / raw) To: Janne Grunau Cc: Randy Dunlap, Stephen Rothwell, lirc-list, linux-next, LKML, Maxim Levitsky, linux-media, Mauro Carvalho Chehab On Thu, Jul 29, 2010 at 8:39 AM, Janne Grunau <j@jannau.net> wrote: > On Thu, Jul 29, 2010 at 12:27:01AM -0400, Jarod Wilson wrote: >> On Wed, Jul 28, 2010 at 6:27 PM, Jarod Wilson <jarod@wilsonet.com> wrote: >> > On Wed, Jul 28, 2010 at 6:16 PM, Randy Dunlap <randy.dunlap@oracle.com> wrote: >> >> On 07/28/10 15:04, Janne Grunau wrote: >> >>> On Wed, Jul 28, 2010 at 10:24:17AM -0700, Randy Dunlap wrote: >> >>>> On Wed, 28 Jul 2010 16:28:55 +1000 Stephen Rothwell wrote: >> >>>> >> >>>>> Hi all, >> >>>>> >> >>>>> Changes since 20100727: >> >>>> >> >>>> >> >>>> When USB_SUPPORT is not enabled and MEDIA_SUPPORT is not enabled: >> >>>> >> >>> >> >>> following patch should fix it >> >>> >> >>> Janne >> >> >> >> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> >> >> >> >> Thanks. >> > >> > Acked-by: Jarod Wilson <jarod@redhat.com> >> > >> > Indeed, thanks much, Janne! >> >> D'oh, I should have looked a bit closer... What if instead of making >> all the drivers depend on both LIRC && LIRC_STAGING, LIRC_STAGING just >> depends on LIRC? > > I started adding LIRC to each driver by one. Adding LIRC as LIRC_STAGING > dependency is simpler. See updated patch. > >> And there are a few depends lines with duplicate >> USB's in them and LIRC_IMON should have USB added to it (technically, > > D'oh, I've must have stopped reading after LIRC_STAG... > > fixed and added additional dependencies Yeah, that looks better, thanks! (And this time I looked more carefully). Acked-by: Jarod Wilson <jarod@redhat.com> -- Jarod Wilson jarod@wilsonet.com ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: linux-next: Tree for July 28 (lirc #2) 2010-07-29 12:39 ` Janne Grunau 2010-07-29 15:11 ` Jarod Wilson @ 2010-07-29 16:25 ` Randy Dunlap 1 sibling, 0 replies; 11+ messages in thread From: Randy Dunlap @ 2010-07-29 16:25 UTC (permalink / raw) To: Janne Grunau Cc: Jarod Wilson, Stephen Rothwell, lirc-list, linux-next, LKML, Maxim Levitsky, linux-media, Mauro Carvalho Chehab On 07/29/10 05:39, Janne Grunau wrote: > On Thu, Jul 29, 2010 at 12:27:01AM -0400, Jarod Wilson wrote: >> On Wed, Jul 28, 2010 at 6:27 PM, Jarod Wilson <jarod@wilsonet.com> wrote: >>> On Wed, Jul 28, 2010 at 6:16 PM, Randy Dunlap <randy.dunlap@oracle.com> wrote: >>>> On 07/28/10 15:04, Janne Grunau wrote: >>>>> On Wed, Jul 28, 2010 at 10:24:17AM -0700, Randy Dunlap wrote: >>>>>> On Wed, 28 Jul 2010 16:28:55 +1000 Stephen Rothwell wrote: >>>>>> >>>>>>> Hi all, >>>>>>> >>>>>>> Changes since 20100727: >>>>>> >>>>>> >>>>>> When USB_SUPPORT is not enabled and MEDIA_SUPPORT is not enabled: >>>>>> >>>>> >>>>> following patch should fix it >>>>> >>>>> Janne >>>> >>>> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> >>>> >>>> Thanks. >>> >>> Acked-by: Jarod Wilson <jarod@redhat.com> >>> >>> Indeed, thanks much, Janne! >> >> D'oh, I should have looked a bit closer... What if instead of making >> all the drivers depend on both LIRC && LIRC_STAGING, LIRC_STAGING just >> depends on LIRC? > > I started adding LIRC to each driver by one. Adding LIRC as LIRC_STAGING > dependency is simpler. See updated patch. > >> And there are a few depends lines with duplicate >> USB's in them and LIRC_IMON should have USB added to it (technically, > > D'oh, I've must have stopped reading after LIRC_STAG... > > fixed and added additional dependencies > > Janne Yes, this one works also. Thanks for the update. > > From 45d384de90e3709a986700db14888eff77bb7e1f Mon Sep 17 00:00:00 2001 > From: Janne Grunau <j@jannau.net> > Date: Wed, 28 Jul 2010 23:53:35 +0200 > Subject: [PATCH 1/2] V4L/DVB: staging/lirc: fix Kconfig dependencies > > Signed-off-by: Janne Grunau <j@jannau.net> > --- > drivers/staging/lirc/Kconfig | 19 ++++++++++--------- > 1 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/drivers/staging/lirc/Kconfig b/drivers/staging/lirc/Kconfig > index 968c2ade..ab30a09 100644 > --- a/drivers/staging/lirc/Kconfig > +++ b/drivers/staging/lirc/Kconfig > @@ -3,6 +3,7 @@ > # > menuconfig LIRC_STAGING > bool "Linux Infrared Remote Control IR receiver/transmitter drivers" > + depends on LIRC > help > Say Y here, and all supported Linux Infrared Remote Control IR and > RF receiver and transmitter drivers will be displayed. When paired > @@ -13,13 +14,13 @@ if LIRC_STAGING > > config LIRC_BT829 > tristate "BT829 based hardware" > - depends on LIRC_STAGING > + depends on LIRC_STAGING && PCI > help > Driver for the IR interface on BT829-based hardware > > config LIRC_ENE0100 > tristate "ENE KB3924/ENE0100 CIR Port Reciever" > - depends on LIRC_STAGING > + depends on LIRC_STAGING && PNP > help > This is a driver for CIR port handled by ENE KB3924 embedded > controller found on some notebooks. > @@ -27,7 +28,7 @@ config LIRC_ENE0100 > > config LIRC_I2C > tristate "I2C Based IR Receivers" > - depends on LIRC_STAGING > + depends on LIRC_STAGING && I2C > help > Driver for I2C-based IR receivers, such as those commonly > found onboard Hauppauge PVR-150/250/350 video capture cards > @@ -40,7 +41,7 @@ config LIRC_IGORPLUGUSB > > config LIRC_IMON > tristate "Legacy SoundGraph iMON Receiver and Display" > - depends on LIRC_STAGING > + depends on LIRC_STAGING && USB > help > Driver for the original SoundGraph iMON IR Receiver and Display > > @@ -48,7 +49,7 @@ config LIRC_IMON > > config LIRC_IT87 > tristate "ITE IT87XX CIR Port Receiver" > - depends on LIRC_STAGING > + depends on LIRC_STAGING && PNP > help > Driver for the ITE IT87xx IR Receiver > > @@ -60,13 +61,13 @@ config LIRC_ITE8709 > > config LIRC_PARALLEL > tristate "Homebrew Parallel Port Receiver" > - depends on LIRC_STAGING && !SMP > + depends on LIRC_STAGING && PARPORT && !SMP > help > Driver for Homebrew Parallel Port Receivers > > config LIRC_SASEM > tristate "Sasem USB IR Remote" > - depends on LIRC_STAGING > + depends on LIRC_STAGING && USB > help > Driver for the Sasem OnAir Remocon-V or Dign HV5 HTPC IR/VFD Module > > @@ -91,7 +92,7 @@ config LIRC_SIR > > config LIRC_STREAMZAP > tristate "Streamzap PC Receiver" > - depends on LIRC_STAGING > + depends on LIRC_STAGING && USB > help > Driver for the Streamzap PC Receiver > > @@ -103,7 +104,7 @@ config LIRC_TTUSBIR > > config LIRC_ZILOG > tristate "Zilog/Hauppauge IR Transmitter" > - depends on LIRC_STAGING > + depends on LIRC_STAGING && I2C > help > Driver for the Zilog/Hauppauge IR Transmitter, found on > PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards -- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2010-07-29 16:27 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20100728162855.4968e561.sfr@canb.auug.org.au>
2010-07-28 17:13 ` linux-next: Tree for July 28 (lirc) Randy Dunlap
2010-07-29 15:35 ` [PATCH] staging/lirc: fix non-CONFIG_MODULES build horkage Jarod Wilson
2010-07-29 16:24 ` Randy Dunlap
2010-07-28 17:24 ` linux-next: Tree for July 28 (lirc #2) Randy Dunlap
2010-07-28 22:04 ` Janne Grunau
2010-07-28 22:16 ` Randy Dunlap
2010-07-28 22:27 ` Jarod Wilson
2010-07-29 4:27 ` Jarod Wilson
2010-07-29 12:39 ` Janne Grunau
2010-07-29 15:11 ` Jarod Wilson
2010-07-29 16:25 ` Randy Dunlap
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox