[parisc-linux-cvs] Minor pci.c cleanup

[Matthew Wilcox]

This file is only ocmpiled if CONFIG_PCI is set, so there's no point
in having half the file conditionalised on CONFIG_PCI being set.
linux-2.4 is no long `new stuff', so that comment can go, and if we
assert pci_bios != NULL, we don't have to check it later.

Index: arch/parisc/kernel/pci.c
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/pci.c,v
retrieving revision 1.23
diff -u -p -r1.23 pci.c
--- pci.c	2001/07/17 00:27:03	1.23
+++ pci.c	2001/08/23 18:28:17
@@ -9,7 +9,6 @@
  * Copyright (C) 1999-2001 Hewlett-Packard Company
  * Copyright (C) 1999-2001 Grant Grundler
  */
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>		/* for __init and __devinit */
@@ -21,8 +20,6 @@
 #include <asm/cache.h>		/* for L1_CACHE_BYTES */
 #include <asm/pdc.h>         /* for is_pdc_pat() macro */
 
-#ifdef CONFIG_PCI
-
 #define DEBUG_RESOURCES 0
 #define DEBUG_CONFIG 0
 
@@ -115,13 +112,10 @@ void pcibios_init(void)
 {
 	ASSERT(pci_bios != NULL);
 
-	if (pci_bios)
-	{
-		if (pci_bios->init) {
-			(*pci_bios->init)();
-		} else {
-			printk(KERN_WARNING "pci_bios != NULL but init() is!\n");
-		}
+	if (pci_bios->init) {
+		pci_bios->init();
+	} else {
+		printk(KERN_WARNING "pci_bios != NULL but init() is!\n");
 	}
 }
 
@@ -144,14 +138,6 @@ char *pcibios_setup(char *str)
 	return str;
 }
 
-#endif /* defined(CONFIG_PCI) */
-
-
-
-/* -------------------------------------------------------------------
-** linux-2.4: NEW STUFF 
-** --------------------
-*/
 
 /*
 ** Used in drivers/pci/quirks.c