[parisc-linux-cvs] [PATCH] -pa70 remove bogus printk's and BUG()'s from ccio.

[Ryan Bradetich]

--Nq2Wo0NMKNjxTN9z
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hello parisc-linux hackers,

This patch removes some erroroneous printk's and BUG()'s
from the ccio driver for BXXX like machines.

Thanks,

- Ryan

--Nq2Wo0NMKNjxTN9z
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="BUG.diff"

Index: Makefile
===================================================================
RCS file: /home/cvs/parisc/linux/Makefile,v
retrieving revision 1.181
diff -u -p -r1.181 Makefile
--- Makefile	2001/10/23 21:02:53	1.181
+++ Makefile	2001/10/24 00:36:37
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 9
-EXTRAVERSION = -pa69
+EXTRAVERSION = -pa70
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
Index: arch/parisc/kernel/ccio-dma.c
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/ccio-dma.c,v
retrieving revision 1.44
diff -u -p -r1.44 ccio-dma.c
--- ccio-dma.c	2001/10/22 05:10:01	1.44
+++ ccio-dma.c	2001/10/24 00:36:37
@@ -1423,10 +1423,6 @@ static struct parisc_device * ccio_find_
 		dev = dev->parent;
 	}
 
-	printk(KERN_ERR MODULE_NAME 
-	       ": IOMMU not found in device hardware path\n");
-	BUG();
-
 	return NULL;
 }
 
@@ -1442,13 +1438,6 @@ static struct ioc * ccio_find_ioc(int hw
 	int i;
 	struct ioc *ioc;
 
-	if(!ioc_count) {
-		printk(KERN_ERR MODULE_NAME 
-		       ": IOMMU list in ccio driver is empty\n");
-		BUG();
-		return NULL;
-	}
-
 	ioc = ioc_list;
 	for (i = 0; i < ioc_count; i++) {
 		if(ioc->hw_path == hw_path)
@@ -1456,10 +1445,6 @@ static struct ioc * ccio_find_ioc(int hw
 
 		ioc = ioc->next;
 	}
-
-	printk(KERN_ERR MODULE_NAME ": IOMMU found in device hardware "
-	       "path not present in the ccio driver.\n");
-	BUG();
 
 	return NULL;
 }

--Nq2Wo0NMKNjxTN9z--