PCI: removed pcibios_read_config_* and pcibios_write_config_* functions.

diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index 39322fec9a8fd3a819243aa3fe0c8fa851d101f9..2749c3ccd85908d4e6126cd0f60749330a77b57f 100644 (file)
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -3,10 +3,10 @@
 #
 
 export-objs    := access.o hotplug.o pci-driver.o pci.o pool.o \
-                       probe.o proc.o search.o compat.o setup-bus.o
+                       probe.o proc.o search.o setup-bus.o
 
 obj-y          += access.o probe.o pci.o pool.o quirks.o \
-                       compat.o names.o pci-driver.o search.o hotplug.o
+                       names.o pci-driver.o search.o hotplug.o
 obj-$(CONFIG_PM)  += power.o
 obj-$(CONFIG_PROC_FS) += proc.o
 

diff --git a/drivers/pci/compat.c b/drivers/pci/compat.c
deleted file mode 100644 (file)
index 048c610..0000000
--- a/drivers/pci/compat.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *     $Id: compat.c,v 1.1 1998/02/16 10:35:50 mj Exp $
- *
- *     PCI Bus Services -- Function For Backward Compatibility
- *
- *     Copyright 1998--2000 Martin Mares <mj@ucw.cz>
- */
-
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-
-/* Obsolete functions, these will be going away... */
-
-#define PCI_OP(rw,size,type)                                                   \
-int pcibios_##rw##_config_##size (unsigned char bus, unsigned char dev_fn,     \
-                                 unsigned char where, unsigned type val)       \
-{                                                                              \
-       struct pci_dev *dev = pci_find_slot(bus, dev_fn);                       \
-       if (!dev) return PCIBIOS_DEVICE_NOT_FOUND;                              \
-       return pci_##rw##_config_##size(dev, where, val);                       \
-}
-
-PCI_OP(read, byte, char *)
-PCI_OP(read, word, short *)
-PCI_OP(read, dword, int *)
-PCI_OP(write, byte, char)
-PCI_OP(write, word, short)
-PCI_OP(write, dword, int)
-
-EXPORT_SYMBOL(pcibios_read_config_byte);
-EXPORT_SYMBOL(pcibios_read_config_word);
-EXPORT_SYMBOL(pcibios_read_config_dword);
-EXPORT_SYMBOL(pcibios_write_config_byte);
-EXPORT_SYMBOL(pcibios_write_config_word);
-EXPORT_SYMBOL(pcibios_write_config_dword);

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 7206acd7870b711aa112adb84d99aed1cd7a220c..3fa04d5f93f8f8422a602ef32ea9bfdc1c339a1c 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -517,21 +517,6 @@ void pcibios_update_resource(struct pci_dev *, struct resource *,
 void pcibios_update_irq(struct pci_dev *, int irq);
 void pcibios_fixup_pbus_ranges(struct pci_bus *, struct pbus_set_ranges_data *);
 
-/* Backward compatibility, don't use in new code! */
-
-int pcibios_read_config_byte (unsigned char bus, unsigned char dev_fn,
-                             unsigned char where, unsigned char *val);
-int pcibios_read_config_word (unsigned char bus, unsigned char dev_fn,
-                             unsigned char where, unsigned short *val);
-int pcibios_read_config_dword (unsigned char bus, unsigned char dev_fn,
-                              unsigned char where, unsigned int *val);
-int pcibios_write_config_byte (unsigned char bus, unsigned char dev_fn,
-                              unsigned char where, unsigned char val);
-int pcibios_write_config_word (unsigned char bus, unsigned char dev_fn,
-                              unsigned char where, unsigned short val);
-int pcibios_write_config_dword (unsigned char bus, unsigned char dev_fn,
-                               unsigned char where, unsigned int val);
-
 /* Generic PCI functions used internally */
 
 int pci_bus_exists(const struct list_head *list, int nr);
@@ -668,8 +653,6 @@ extern struct pci_dev *isa_bridge;
 static inline int pci_present(void) { return 0; }
 
 #define _PCI_NOP(o,s,t) \
-       static inline int pcibios_##o##_config_##s (u8 bus, u8 dfn, u8 where, t val) \
-               { return PCIBIOS_FUNC_NOT_SUPPORTED; } \
        static inline int pci_##o##_config_##s (struct pci_dev *dev, int where, t val) \
                { return PCIBIOS_FUNC_NOT_SUPPORTED; }
 #define _PCI_NOP_ALL(o,x)      _PCI_NOP(o,byte,u8 x) \