PCI: Move pci_uevent into pci-driver.c

With the demise of CONFIG_HOTPLUG as an option, the pci_uevent
function located in hotplug.c will now always be used and doesn't need
special treatment in the Makefile.  Move pci_uevent into pci-driver.c
and remove hotplug.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index 8d688b260e2824028a5ea55eceedbfeed680fadd..36f119d9c3424fa897bb144f919e8db1be2dca32 100644 (file)
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -15,8 +15,6 @@ obj-$(CONFIG_PCIEPORTBUS) += pcie/
 
 obj-$(CONFIG_PCI_IOAPIC) += ioapic.o
 
-obj-$(CONFIG_HOTPLUG) += hotplug.o
-
 # Build the PCI Hotplug drivers if we were asked to
 obj-$(CONFIG_HOTPLUG_PCI) += hotplug/
 ifdef CONFIG_HOTPLUG_PCI

diff --git a/drivers/pci/hotplug.c b/drivers/pci/hotplug.c
deleted file mode 100644 (file)
index 2b5352a..0000000
--- a/drivers/pci/hotplug.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/module.h>
-#include "pci.h"
-
-int pci_uevent(struct device *dev, struct kobj_uevent_env *env)
-{
-       struct pci_dev *pdev;
-
-       if (!dev)
-               return -ENODEV;
-
-       pdev = to_pci_dev(dev);
-       if (!pdev)
-               return -ENODEV;
-
-       if (add_uevent_var(env, "PCI_CLASS=%04X", pdev->class))
-               return -ENOMEM;
-
-       if (add_uevent_var(env, "PCI_ID=%04X:%04X", pdev->vendor, pdev->device))
-               return -ENOMEM;
-
-       if (add_uevent_var(env, "PCI_SUBSYS_ID=%04X:%04X", pdev->subsystem_vendor,
-                          pdev->subsystem_device))
-               return -ENOMEM;
-
-       if (add_uevent_var(env, "PCI_SLOT_NAME=%s", pci_name(pdev)))
-               return -ENOMEM;
-
-       if (add_uevent_var(env, "MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x",
-                          pdev->vendor, pdev->device,
-                          pdev->subsystem_vendor, pdev->subsystem_device,
-                          (u8)(pdev->class >> 16), (u8)(pdev->class >> 8),
-                          (u8)(pdev->class)))
-               return -ENOMEM;
-       return 0;
-}

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 8919801cb27e43a43d5dda91fd3343aebe706ef7..1dc78c5cabf8f52175159ef6191a479828497e08 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -1215,6 +1215,39 @@ void pci_dev_put(struct pci_dev *dev)
                put_device(&dev->dev);
 }
 
+static int pci_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+       struct pci_dev *pdev;
+
+       if (!dev)
+               return -ENODEV;
+
+       pdev = to_pci_dev(dev);
+       if (!pdev)
+               return -ENODEV;
+
+       if (add_uevent_var(env, "PCI_CLASS=%04X", pdev->class))
+               return -ENOMEM;
+
+       if (add_uevent_var(env, "PCI_ID=%04X:%04X", pdev->vendor, pdev->device))
+               return -ENOMEM;
+
+       if (add_uevent_var(env, "PCI_SUBSYS_ID=%04X:%04X", pdev->subsystem_vendor,
+                          pdev->subsystem_device))
+               return -ENOMEM;
+
+       if (add_uevent_var(env, "PCI_SLOT_NAME=%s", pci_name(pdev)))
+               return -ENOMEM;
+
+       if (add_uevent_var(env, "MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x",
+                          pdev->vendor, pdev->device,
+                          pdev->subsystem_vendor, pdev->subsystem_device,
+                          (u8)(pdev->class >> 16), (u8)(pdev->class >> 8),
+                          (u8)(pdev->class)))
+               return -ENOMEM;
+       return 0;
+}
+
 struct bus_type pci_bus_type = {
        .name           = "pci",
        .match          = pci_bus_match,

diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 6e993af4d30b149ee882e5ecd40c466c7acbbba2..e253881c42759eaeb2b76070f830de192663e347 100644 (file)
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -8,7 +8,6 @@
 
 /* Functions internal to the PCI core code */
 
-extern int pci_uevent(struct device *dev, struct kobj_uevent_env *env);
 extern int pci_create_sysfs_dev_files(struct pci_dev *pdev);
 extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev);
 #if !defined(CONFIG_DMI) && !defined(CONFIG_ACPI)