[parisc-linux-cvs] DIFF 2.4.16-pa25 pci_hba_count fix

[Grant Grundler]

Grant Grundler wrote:
> 	arch/parisc/kernel: pci.c 
> 
> Log message:
> 2.4.16-pa25
> do NOT reserve EISA HBA bus 0 by statically initializing pci_hba_count to 1.
> suckyio requires HBA 0 in order to work since it has lots of legacy
> drivers using it. EISA and suckyio are mutually exclusive since no hppa
> machine has both (someone will probably hand me a brain-dead EISA add-on
> PCI device for saying that ;^).

I also word smithed a comment and removed some leftover debug code.


Index: Makefile
===================================================================
RCS file: /var/cvs/linux/Makefile,v
retrieving revision 1.229
diff -u -p -r1.229 Makefile
--- Makefile	2001/12/21 23:50:06	1.229
+++ Makefile	2001/12/26 05:53:04
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 16
-EXTRAVERSION = -pa24
+EXTRAVERSION = -pa25
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
Index: arch/parisc/kernel/pci.c
===================================================================
RCS file: /var/cvs/linux/arch/parisc/kernel/pci.c,v
retrieving revision 1.30
diff -u -p -r1.30 pci.c
--- arch/parisc/kernel/pci.c	2001/12/21 23:50:07	1.30
+++ arch/parisc/kernel/pci.c	2001/12/26 05:53:04
@@ -52,7 +52,7 @@ int pci_post_reset_delay = 50;
 struct pci_port_ops *pci_port;
 struct pci_bios_ops *pci_bios;
 
-int pci_hba_count = 1;
+int pci_hba_count = 0;
 
 /*
 ** parisc_pci_hba used by pci_port->in/out() ops to lookup bus data.
@@ -70,8 +70,8 @@ struct pci_hba_data *parisc_pci_hba[PCI_
 /* EISA port numbers and PCI port numbers share the same interface.  Some
  * machines have both EISA and PCI adapters installed.  Rather than turn
  * pci_port into an array, we reserve bus 0 for EISA and call the EISA
- * routines if the access is to a port on bus 0.  Many EISA and ISA drivers
- * assume that port space is <= 0xffff anyway, so we don't have to fix them.
+ * routines if the access is to a port on bus 0.  We don't want to fix
+ * EISA and ISA drivers which assume port space is <= 0xffff.
  */
 
 #ifdef CONFIG_EISA
@@ -93,7 +93,6 @@ u##size in##type (int addr) \
 	if (parisc_pci_hba[b] == NULL) { \
 		printk(KERN_WARNING "\nPCI or EISA Host Bus Adapter %d not registered. in" #size "(0x%x) returning -1\n", b, addr); \
 	} else { \
-		if (size == 16) printk("inw: addr %x\n"); \
 		d = pci_port->in##type(parisc_pci_hba[b], PCI_PORT_ADDR(addr)); \
 	} \
 	return d; \