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 tag 'drm/for-3.14-rc1-20140123' of git://anongit.freedesktop.org/tegra/linux...
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
pci-acpi.h
diff --git
a/include/linux/pci-acpi.h
b/include/linux/pci-acpi.h
index d006f0ca60f46e92705fb8b3fd315ebacc5242b2..5a462c4e5009d68960525d2167728d59ee75e33b 100644
(file)
--- a/
include/linux/pci-acpi.h
+++ b/
include/linux/pci-acpi.h
@@
-27,7
+27,7
@@
static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
while (!pci_is_root_bus(pbus))
pbus = pbus->parent;
while (!pci_is_root_bus(pbus))
pbus = pbus->parent;
- return
DEVICE_
ACPI_HANDLE(pbus->bridge);
+ return ACPI_HANDLE(pbus->bridge);
}
static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus)
}
static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus)
@@
-39,7
+39,7
@@
static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus)
else
dev = &pbus->self->dev;
else
dev = &pbus->self->dev;
- return
DEVICE_
ACPI_HANDLE(dev);
+ return ACPI_HANDLE(dev);
}
void acpi_pci_add_bus(struct pci_bus *bus);
}
void acpi_pci_add_bus(struct pci_bus *bus);