linux-next: Tree for July 28

Hi all,

Changes since 20100727:

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 <[email protected]>

---
 drivers/staging/lirc/lirc_it87.c     |    9 ++++++---
 drivers/staging/lirc/lirc_parallel.c |    4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

drivers/staging/lirc/lirc_it87.c +6 -3

index 781abc3..72f07f1 100644
@@ -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 */

drivers/staging/lirc/lirc_parallel.c +2 -2

index df12e7b..04ce97713 100644
@@ -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);

Hi all,

Changes since 20100727:

Quoted 3 lines · 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:

From 7d1cc98c19a6c27dd74a28f04dfe4248a0b335ce Mon Sep 17 00:00:00 2001

Quoted 7 lines · Randy Dunlap

Quoted 3 lines · On Wed, 28 Jul 2010 16:28:55 +1000 Stephen Rothwell wrote:

Hi all,

Changes since 20100727:

Quoted 2 lines

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 <[email protected]>
Date: Wed, 28 Jul 2010 23:53:35 +0200
Subject: [PATCH 1/2] staging/lirc: fix Kconfig dependencies

Signed-off-by Janne Grunau <[email protected]>

---
 drivers/staging/lirc/Kconfig |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

drivers/staging/lirc/Kconfig +14 -14

index 968c2ade..3981a4a 100644
@@ -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

Quoted 11 lines · Janne Grunau

Quoted 9 lines · Randy Dunlap

Quoted 3 lines · 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:

Quoted 3 lines

following patch should fix it

Janne

Acked-by Randy Dunlap <[email protected]>

Thanks.

Quoted 114 lines

From 7d1cc98c19a6c27dd74a28f04dfe4248a0b335ce Mon Sep 17 00:00:00 2001
From: Janne Grunau <[email protected]>
Date: Wed, 28 Jul 2010 23:53:35 +0200
Subject: [PATCH 1/2] staging/lirc: fix Kconfig dependencies

Signed-off-by Janne Grunau <[email protected]>

---
 drivers/staging/lirc/Kconfig |   28 ++++++++++++++--------------

 1 files changed, 14 insertions(+), 14 deletions(-)

drivers/staging/lirc/Kconfig +0 -0

index 968c2ade..3981a4a 100644
@@ -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.

drivers/staging/lirc/Kconfig +0 -0

@@ -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

drivers/staging/lirc/Kconfig +0 -0

@@ -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

drivers/staging/lirc/Kconfig +0 -0

@@ -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

Quoted 7 lines

 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 ***

Quoted 16 lines · Randy Dunlap

Quoted 14 lines · Janne Grunau

Quoted 9 lines · Randy Dunlap

Quoted 3 lines · 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

Quoted 3 lines

Acked-by Randy Dunlap <[email protected]>

Thanks.

Acked-by Jarod Wilson <[email protected]>

Indeed, thanks much, Janne!

Quoted 21 lines · Jarod Wilson

Quoted 19 lines · Randy Dunlap

Quoted 8 lines · Janne Grunau

Quoted 7 lines · Randy Dunlap

Quoted 3 lines · On Wed, 28 Jul 2010 16:28:55 +1000 Stephen Rothwell wrote:

Hi all,

Changes since 20100727:

Quoted 6 lines

Quoted 2 lines

When USB_SUPPORT is not enabled and MEDIA_SUPPORT is not enabled:

following patch should fix it

Janne

Acked-by Randy Dunlap <[email protected]>

Thanks.

Quoted 3 lines

Acked-by Jarod Wilson <[email protected]>

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,

From 45d384de90e3709a986700db14888eff77bb7e1f Mon Sep 17 00:00:00 2001

Quoted 22 lines · Jarod Wilson

Quoted 21 lines · Jarod Wilson

Quoted 19 lines · Randy Dunlap

Quoted 8 lines · Janne Grunau

Quoted 7 lines · Randy Dunlap

Quoted 3 lines · On Wed, 28 Jul 2010 16:28:55 +1000 Stephen Rothwell wrote:

Hi all,

Changes since 20100727:

Quoted 6 lines

Quoted 2 lines

When USB_SUPPORT is not enabled and MEDIA_SUPPORT is not enabled:

following patch should fix it

Janne

Acked-by Randy Dunlap <[email protected]>

Thanks.

Quoted 7 lines

Quoted 3 lines

Acked-by Jarod Wilson <[email protected]>

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.

Quoted 2 lines

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

Quoted 22 lines · Jarod Wilson

Quoted 21 lines · Jarod Wilson

Quoted 19 lines · Randy Dunlap

Quoted 8 lines · Janne Grunau

Quoted 7 lines · Randy Dunlap

Quoted 3 lines · On Wed, 28 Jul 2010 16:28:55 +1000 Stephen Rothwell wrote:

Hi all,

Changes since 20100727:

Quoted 6 lines

Quoted 2 lines

When USB_SUPPORT is not enabled and MEDIA_SUPPORT is not enabled:

following patch should fix it

Janne

Acked-by Randy Dunlap <[email protected]>

Thanks.

Quoted 7 lines

Quoted 3 lines

Acked-by Jarod Wilson <[email protected]>

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.

Quoted 2 lines

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 <[email protected]>
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 <[email protected]>

---
 drivers/staging/lirc/Kconfig |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

drivers/staging/lirc/Kconfig +10 -9

index 968c2ade..ab30a09 100644
@@ -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