projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
powerpc
/
kernel
/
pci_of_scan.c
diff --git
a/arch/powerpc/kernel/pci_of_scan.c
b/arch/powerpc/kernel/pci_of_scan.c
index 30378a19f65d03f43ab671c004e2027a793359ae..2a67e9baa59f80200f4a25b5a75471c04f04c776 100644
(file)
--- a/
arch/powerpc/kernel/pci_of_scan.c
+++ b/
arch/powerpc/kernel/pci_of_scan.c
@@
-204,7
+204,7
@@
EXPORT_SYMBOL(of_create_pci_dev);
* this routine in turn call of_scan_bus() recusively to scan for more child
* devices.
*/
* this routine in turn call of_scan_bus() recusively to scan for more child
* devices.
*/
-void
__devinit
of_scan_pci_bridge(struct pci_dev *dev)
+void of_scan_pci_bridge(struct pci_dev *dev)
{
struct device_node *node = dev->dev.of_node;
struct pci_bus *bus;
{
struct device_node *node = dev->dev.of_node;
struct pci_bus *bus;
@@
-299,8
+299,8
@@
EXPORT_SYMBOL(of_scan_pci_bridge);
* @bus: pci_bus structure for the PCI bus
* @rescan_existing: Flag indicating bus has already been set up
*/
* @bus: pci_bus structure for the PCI bus
* @rescan_existing: Flag indicating bus has already been set up
*/
-static void __
devinit __of_scan_bus(struct device_node *node
,
-
struct pci_bus *bus,
int rescan_existing)
+static void __
of_scan_bus(struct device_node *node, struct pci_bus *bus
,
+ int rescan_existing)
{
struct device_node *child;
const u32 *reg;
{
struct device_node *child;
const u32 *reg;
@@
-348,8
+348,7
@@
static void __devinit __of_scan_bus(struct device_node *node,
* @node: device tree node for the PCI bus
* @bus: pci_bus structure for the PCI bus
*/
* @node: device tree node for the PCI bus
* @bus: pci_bus structure for the PCI bus
*/
-void __devinit of_scan_bus(struct device_node *node,
- struct pci_bus *bus)
+void of_scan_bus(struct device_node *node, struct pci_bus *bus)
{
__of_scan_bus(node, bus, 0);
}
{
__of_scan_bus(node, bus, 0);
}
@@
-363,8
+362,7
@@
EXPORT_SYMBOL_GPL(of_scan_bus);
* Same as of_scan_bus, but for a pci_bus structure that has already been
* setup.
*/
* Same as of_scan_bus, but for a pci_bus structure that has already been
* setup.
*/
-void __devinit of_rescan_bus(struct device_node *node,
- struct pci_bus *bus)
+void of_rescan_bus(struct device_node *node, struct pci_bus *bus)
{
__of_scan_bus(node, bus, 1);
}
{
__of_scan_bus(node, bus, 1);
}