Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ccc9aa1 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

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: default avatarBill Pemberton <wfp5p@virginia.edu>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b40b97ae

drivers/pci/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -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

drivers/pci/hotplug.c

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
#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;

}

drivers/pci/pci-driver.c

+33 −0
Original line number Diff line number Diff line
@@ -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,

drivers/pci/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -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)