Commit 876e501a authored by Yu Zhao's avatar Yu Zhao Committed by Jesse Barnes

PCI: factor pci_bus_add_child() from pci_bus_add_devices()

This patch splits a new function, pci_bus_add_child(), from
pci_bus_add_devices(). The new function can be used to register PCI
buses to the device core.
Signed-off-by: default avatarYu Zhao <yu.zhao@intel.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 3fa16fdb
...@@ -90,6 +90,37 @@ int pci_bus_add_device(struct pci_dev *dev) ...@@ -90,6 +90,37 @@ int pci_bus_add_device(struct pci_dev *dev)
return 0; return 0;
} }
/**
* pci_bus_add_child - add a child bus
* @bus: bus to add
*
* This adds sysfs entries for a single bus
*/
int pci_bus_add_child(struct pci_bus *bus)
{
int retval;
if (bus->bridge)
bus->dev.parent = bus->bridge;
retval = device_register(&bus->dev);
if (retval)
return retval;
bus->is_added = 1;
retval = device_create_file(&bus->dev, &dev_attr_cpuaffinity);
if (retval)
return retval;
retval = device_create_file(&bus->dev, &dev_attr_cpulistaffinity);
/* Create legacy_io and legacy_mem files for this bus */
pci_create_legacy_files(bus);
return retval;
}
/** /**
* pci_bus_add_devices - insert newly discovered PCI devices * pci_bus_add_devices - insert newly discovered PCI devices
* @bus: bus to check for new devices * @bus: bus to check for new devices
...@@ -140,30 +171,9 @@ void pci_bus_add_devices(struct pci_bus *bus) ...@@ -140,30 +171,9 @@ void pci_bus_add_devices(struct pci_bus *bus)
*/ */
if (child->is_added) if (child->is_added)
continue; continue;
child->dev.parent = child->bridge; retval = pci_bus_add_child(child);
retval = device_register(&child->dev);
if (retval) if (retval)
dev_err(&dev->dev, "Error registering pci_bus," dev_err(&dev->dev, "Error adding bus, continuing\n");
" continuing...\n");
else {
child->is_added = 1;
retval = device_create_file(&child->dev,
&dev_attr_cpuaffinity);
if (retval)
dev_err(&dev->dev, "Error creating cpuaffinity"
" file, continuing...\n");
retval = device_create_file(&child->dev,
&dev_attr_cpulistaffinity);
if (retval)
dev_err(&dev->dev,
"Error creating cpulistaffinity"
" file, continuing...\n");
/* Create legacy_io and legacy_mem files for this bus */
pci_create_legacy_files(child_bus);
}
} }
} }
......
...@@ -173,6 +173,7 @@ extern int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, ...@@ -173,6 +173,7 @@ extern int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
struct resource *res, unsigned int reg); struct resource *res, unsigned int reg);
extern int pci_resource_bar(struct pci_dev *dev, int resno, extern int pci_resource_bar(struct pci_dev *dev, int resno,
enum pci_bar_type *type); enum pci_bar_type *type);
extern int pci_bus_add_child(struct pci_bus *bus);
extern void pci_enable_ari(struct pci_dev *dev); extern void pci_enable_ari(struct pci_dev *dev);
/** /**
* pci_ari_enabled - query ARI forwarding status * pci_ari_enabled - query ARI forwarding status
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment