Re: [patch 1/2] fakephp: introduce pci_bus_add_device

[Jan Dittmer <jdittmer@ppp0.net>]

[-- Attachment #1: Type: text/plain, Size: 818 bytes --]

Greg KH wrote:
> On Tue, Nov 02, 2004 at 11:51:15PM +0100, Jan Dittmer wrote:
> 
>>Christoph Hellwig wrote:
>>
>>>On Mon, Nov 01, 2004 at 12:59:54AM +0100, Jan Dittmer wrote:
>>>
>>>
>>>>fakephp needs to add newly discovered devices to the global pci list.
>>>>Therefore seperate out the appropriate chunk from pci_bus_add_devices
>>>>to pci_bus_add_device to add a single device to sysfs, procfs
>>>>and the global device list.
>>>>
>>>>Signed-off-by: Jan Dittmer <jdittmer@ppp0.net>
>>
>>>the brace should go to a line of it's own
>>
>>Sorry about that, updated patch follows:
> 
> 
> Ugh, your email client ate all of the tabs and spit them out as spaces
> for this patch :(
> 
> Care to try it again?

Well, I still don't know how to do this with Thunderbird as
non attachment. So here it goes as attachment.

Jan

[-- Attachment #2: pci_bus_add_device-2.patch --]
[-- Type: text/x-patch, Size: 1806 bytes --]

===== drivers/pci/bus.c 1.9 vs edited =====
--- 1.9/drivers/pci/bus.c	2004-04-11 00:27:59 +02:00
+++ edited/drivers/pci/bus.c	2004-11-01 10:41:27 +01:00
@@ -69,6 +69,25 @@
 }
 
 /**
+ * add a single device
+ * @dev: device to add
+ *
+ * This adds a single pci device to the global
+ * device list and adds sysfs and procfs entries
+ */
+void __devinit pci_bus_add_device(struct pci_dev *dev)
+{
+	device_add(&dev->dev);
+
+	spin_lock(&pci_bus_lock);
+	list_add_tail(&dev->global_list, &pci_devices);
+	spin_unlock(&pci_bus_lock);
+
+	pci_proc_attach_device(dev);
+	pci_create_sysfs_dev_files(dev);
+}
+
+/**
  * pci_bus_add_devices - insert newly discovered PCI devices
  * @bus: bus to check for new devices
  *
@@ -91,16 +110,7 @@
 		 */
 		if (!list_empty(&dev->global_list))
 			continue;
-
-		device_add(&dev->dev);
-
-		spin_lock(&pci_bus_lock);
-		list_add_tail(&dev->global_list, &pci_devices);
-		spin_unlock(&pci_bus_lock);
-
-		pci_proc_attach_device(dev);
-		pci_create_sysfs_dev_files(dev);
-
+		pci_bus_add_device(dev);
 	}
 
 	list_for_each_entry(dev, &bus->devices, bus_list) {
@@ -136,5 +146,6 @@
 }
 
 EXPORT_SYMBOL(pci_bus_alloc_resource);
+EXPORT_SYMBOL(pci_bus_add_device);
 EXPORT_SYMBOL(pci_bus_add_devices);
 EXPORT_SYMBOL(pci_enable_bridges);
===== include/linux/pci.h 1.139 vs edited =====
--- 1.139/include/linux/pci.h	2004-10-06 00:56:26 +02:00
+++ edited/include/linux/pci.h	2004-10-31 23:10:04 +01:00
@@ -713,6 +713,7 @@
 int pci_scan_slot(struct pci_bus *bus, int devfn);
 struct pci_dev * pci_scan_single_device(struct pci_bus *bus, int devfn);
 unsigned int pci_scan_child_bus(struct pci_bus *bus);
+void pci_bus_add_device(struct pci_dev *dev);
 void pci_bus_add_devices(struct pci_bus *bus);
 void pci_name_device(struct pci_dev *dev);
 char *pci_class_name(u32 class);