rpms/kernel/devel linux-2.6-lirc.patch,1.13,1.14

[Jarod Wilson]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24404

Modified Files:
	linux-2.6-lirc.patch 
Log Message:
silence compile-time warnings from lirc_ite8709.c

linux-2.6-lirc.patch:

Index: linux-2.6-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-lirc.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- linux-2.6-lirc.patch	5 Sep 2008 04:34:05 -0000	1.13
+++ linux-2.6-lirc.patch	5 Sep 2008 05:02:59 -0000	1.14
@@ -1,3 +1,9 @@
+Linux Infrared Remote Control drivers
+
+Signed-off-by: Jarod Wilson <jarod at redhat.com>
+
+---
+
  drivers/input/Kconfig                 |    2 +
  drivers/input/Makefile                |    2 +
  drivers/input/lirc/Kconfig            |  142 ++++
@@ -16,7 +22,7 @@
  drivers/input/lirc/lirc_imon.c        | 1280 ++++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.c        | 1004 +++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.h        |  116 +++
- drivers/input/lirc/lirc_ite8709.c     |  561 +++++++++++++
+ drivers/input/lirc/lirc_ite8709.c     |  548 +++++++++++++
  drivers/input/lirc/lirc_mceusb.c      |  884 +++++++++++++++++++++
  drivers/input/lirc/lirc_mceusb2.c     | 1117 ++++++++++++++++++++++++++
  drivers/input/lirc/lirc_parallel.c    |  732 +++++++++++++++++
@@ -27,7 +33,7 @@
  drivers/input/lirc/lirc_streamzap.c   |  795 +++++++++++++++++++
  drivers/input/lirc/lirc_ttusbir.c     |  394 ++++++++++
  drivers/input/lirc/lirc_zilog.c       | 1397 +++++++++++++++++++++++++++++++++
- 29 files changed, 17873 insertions(+), 0 deletions(-)
+ 29 files changed, 17860 insertions(+), 0 deletions(-)
 
 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
 index 5f9d860..747633c 100644
@@ -8523,10 +8529,10 @@
 +/********************************* ITE IT87xx ************************/
 diff --git a/drivers/input/lirc/lirc_ite8709.c b/drivers/input/lirc/lirc_ite8709.c
 new file mode 100644
-index 0000000..60b28e9
+index 0000000..2e1c178
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_ite8709.c
-@@ -0,0 +1,561 @@
+@@ -0,0 +1,548 @@
 +/*
 + * LIRC driver for ITE8709 CIR port
 + *
@@ -8691,19 +8697,6 @@
 +	ite8709_write(dev, ITE8709_MODE, ITE8709_MODE_WRITE);
 +}
 +
-+static unsigned char ite8709_read_register(struct ite8709_device *dev,
-+						unsigned char reg_adr)
-+{
-+	ite8709_wait_device(dev);
-+
-+	ite8709_write(dev, ITE8709_REG_ADR, reg_adr);
-+	ite8709_write(dev, ITE8709_MODE, ITE8709_MODE_READ);
-+
-+	ite8709_wait_device(dev);
-+
-+	return ite8709_read(dev, ITE8709_REG_VAL);
-+}
-+
 +static void ite8709_init_hardware(struct ite8709_device *dev)
 +{
 +	spin_lock_irq(&dev->hardware_lock);
@@ -8789,12 +8782,12 @@
 +	char bit;
 +	struct timeval curr_tv;
 +
-+	struct ite8709_device *dev;
-+	dev = dev_id;
-+
 +	/* Bit duration in microseconds */
 +	const unsigned long bit_duration = 1000000ul / (115200 / CFG_BDR);
 +
++	struct ite8709_device *dev;
++	dev = dev_id;
++
 +	/* If device is busy, we simply discard data because we are in one of */
 +	/* these two cases : shutting down or rearming the device, so this    */
 +	/* doesn't really matter and this avoids waiting too long in IRQ ctx  */