[RFC patch 3/3] remove pci_driver.owner and .name fields

[Laurent riffard <laurent.riffard@free.fr>]

[-- Attachment #1: remove_pci_driver_owner_name-final_cleanup.patch --]
[-- Type: text/plain, Size: 1659 bytes --]

This is the final cleanup : deletion of pci_driver.name and .owner
happens now. 

Signed-off-by: Laurent Riffard <laurent.riffard@free.fr>
--

 drivers/pci/pci-driver.c |    5 -----
 include/linux/pci.h      |    8 --------
 2 files changed, 13 deletions(-)

Index: linux-2.6-stable/drivers/pci/pci-driver.c
===================================================================
--- linux-2.6-stable.orig/drivers/pci/pci-driver.c
+++ linux-2.6-stable/drivers/pci/pci-driver.c
@@ -339,11 +339,6 @@
 	int error;
 
 	/* initialize common driver fields */
-	if (drv->name) {
-		/* backward compatibility until all pci_driver are converted to
-		 * use pci_driver.driver.name instead of pci_driver.name */
-		drv->driver.name = drv->name;
-	}
 	drv->driver.bus = &pci_bus_type;
 	drv->driver.probe = pci_device_probe;
 	drv->driver.remove = pci_device_remove;
Index: linux-2.6-stable/include/linux/pci.h
===================================================================
--- linux-2.6-stable.orig/include/linux/pci.h
+++ linux-2.6-stable/include/linux/pci.h
@@ -664,14 +664,6 @@
 struct module;
 struct pci_driver {
 	struct list_head node;
-	/*
-	 * Please do not use the 2 following fields, they are planned for
-	 * deletion.
-	 * Use driver.name instead of .name.
-	 * The field driver.owner will be set by pci_register_driver.
-	 */
-	char *name;
-	struct module *owner;
 	const struct pci_device_id *id_table;	/* must be non-NULL for probe to be called */
 	int  (*probe)  (struct pci_dev *dev, const struct pci_device_id *id);	/* New device inserted */
 	void (*remove) (struct pci_dev *dev);	/* Device removed (NULL if not a hot-plug capable driver) */

--