[parisc-linux-cvs] Re: DIFF 2.4.18-pa61 misc cleanup

[Grant Grundler]

Grant Grundler wrote:
> Log message:
> 2.4.18-pa61 misc cleanup
> o fix warnings in ccio/dino (introduced by -pa60)
> o apply TIOCM_MODEM_BITS patch (accepted by Alan Cox)

Diff appended.

I have two diffs outstanding on ftp.p-l.o:~ftp/patches:

o cpqfc-03.diff - needed to build on parisc and load as a module.
		Can't read NVRAM/GBIC though for HP branded XL2 card.

o spinlock_t.diff - attempt to break circular dependency between
		system.h, atomic.h, spinlock.h in asm-parisc.
		Introduces two new files in include/asm :
			spinlock_t.h and system_irqsave.h

Both have been built/tested on a500, SMP.
Feedback on both is appreciated.

grant

Index: Makefile
===================================================================
RCS file: /var/cvs/linux/Makefile,v
retrieving revision 1.331
diff -u -p -r1.331 Makefile
--- Makefile	2 Aug 2002 17:16:20 -0000	1.331
+++ Makefile	3 Aug 2002 08:15:35 -0000
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 18
-EXTRAVERSION = -pa60
+EXTRAVERSION = -pa61
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
Index: arch/parisc/kernel/ccio-dma.c
===================================================================
RCS file: /var/cvs/linux/arch/parisc/kernel/ccio-dma.c,v
retrieving revision 1.54
diff -u -p -r1.54 ccio-dma.c
--- arch/parisc/kernel/ccio-dma.c	28 May 2002 14:28:28 -0000	1.54
+++ arch/parisc/kernel/ccio-dma.c	3 Aug 2002 08:15:35 -0000
@@ -1441,7 +1441,7 @@ ccio_init_resource(struct resource *res,
 	result = request_resource(&iomem_resource, res);
 	if (result < 0) {
 		printk(KERN_ERR 
-		       "%s: failed to claim CCIO bus address space (%p,%p)\n", 
+		       "%s: failed to claim CCIO bus address space (%lx,%lx)\n", 
 		       __FILE__, res->start, res->end);
 	}
 }
@@ -1486,7 +1486,7 @@ static struct resource *ccio_get_resourc
 int ccio_allocate_resource(const struct parisc_device *dev,
 		struct resource *res, unsigned long size,
 		unsigned long min, unsigned long max, unsigned long align,
-		void (*alignf)(void *, struct resource *, unsigned long),
+		void (*alignf)(void *, struct resource *, unsigned long, unsigned long),
 		void *alignf_data)
 {
 	struct ioc *ioc = ccio_get_iommu(dev);
Index: include/asm-parisc/pci.h
===================================================================
RCS file: /var/cvs/linux/include/asm-parisc/pci.h,v
retrieving revision 1.48
diff -u -p -r1.48 pci.h
--- include/asm-parisc/pci.h	7 Mar 2002 21:13:11 -0000	1.48
+++ include/asm-parisc/pci.h	3 Aug 2002 08:15:35 -0000
@@ -273,7 +273,7 @@ int ccio_request_resource(const struct p
 int ccio_allocate_resource(const struct parisc_device *dev,
 		struct resource *res, unsigned long size,
 		unsigned long min, unsigned long max, unsigned long align,
-		void (*alignf)(void *, struct resource *, unsigned long),
+		void (*alignf)(void *, struct resource *, unsigned long, unsigned long),
 		void *alignf_data);
 #else /* !CONFIG_IOMMU_CCIO */
 #define ccio_get_iommu(dev) NULL
Index: include/asm-parisc/termios.h
===================================================================
RCS file: /var/cvs/linux/include/asm-parisc/termios.h,v
retrieving revision 1.6
diff -u -p -r1.6 termios.h
--- include/asm-parisc/termios.h	11 Jul 2001 17:20:32 -0000	1.6
+++ include/asm-parisc/termios.h	3 Aug 2002 08:15:35 -0000
@@ -37,6 +37,9 @@ struct termio {
 #define TIOCM_OUT2	0x4000
 #define TIOCM_LOOP	0x8000
 
+/* IRDA support - PA-RISC uses OUT1 as hardware flow control bit. */
+#define TIOCM_MODEM_BITS        (TIOCM_OUT2 | TIOCM_OUT1)
+
 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
 
 /* line disciplines */
Index: drivers/net/irda/irtty.c
===================================================================
RCS file: /var/cvs/linux/drivers/net/irda/irtty.c,v
retrieving revision 1.8
diff -u -p -r1.8 irtty.c
--- drivers/net/irda/irtty.c	9 Nov 2001 23:36:06 -0000	1.8
+++ drivers/net/irda/irtty.c	3 Aug 2002 08:15:35 -0000
@@ -760,14 +760,11 @@ static int irtty_set_dtr_rts(struct net_
 	struct irtty_cb *self;
 	struct tty_struct *tty;
 	mm_segment_t fs;
-	int arg = 0;
+	int arg = TIOCM_MODEM_BITS;
 
 	self = (struct irtty_cb *) dev->priv;
 	tty = self->tty;
 
-#ifdef TIOCM_OUT2 /* Not defined for ARM */
-	arg = TIOCM_OUT2;
-#endif
 	if (rts)
 		arg |= TIOCM_RTS;
 	if (dtr)
Index: include/asm-i386/termios.h
===================================================================
RCS file: /var/cvs/linux/include/asm-i386/termios.h,v
retrieving revision 1.3
diff -u -p -r1.3 termios.h
--- include/asm-i386/termios.h	5 Jul 2001 21:38:41 -0000	1.3
+++ include/asm-i386/termios.h	3 Aug 2002 08:15:35 -0000
@@ -37,6 +37,8 @@ struct termio {
 #define TIOCM_OUT2	0x4000
 #define TIOCM_LOOP	0x8000
 
+#define TIOCM_MODEM_BITS       TIOCM_OUT2      /* IRDA support */
+
 /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
 
 /* line disciplines */