Commit 9c273b95 authored by Muthu Kumar's avatar Muthu Kumar Committed by Greg Kroah-Hartman

[PATCH] PCI ACPI: Rename the functions to avoid multiple instances.

There were two instances of pci_acpi_init(), one in
drivers/pci/pci-acpi.c and another in arch/i386/pci/acpi.c.
Rename the one in pci-acpi.c and make it consistent with
other names in the same file.
Signed-off-by: default avatarMuthukumar R <muthur@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a1e022b3
...@@ -267,7 +267,7 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state) ...@@ -267,7 +267,7 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
/* ACPI bus type */ /* ACPI bus type */
static int pci_acpi_find_device(struct device *dev, acpi_handle *handle) static int acpi_pci_find_device(struct device *dev, acpi_handle *handle)
{ {
struct pci_dev * pci_dev; struct pci_dev * pci_dev;
acpi_integer addr; acpi_integer addr;
...@@ -281,7 +281,7 @@ static int pci_acpi_find_device(struct device *dev, acpi_handle *handle) ...@@ -281,7 +281,7 @@ static int pci_acpi_find_device(struct device *dev, acpi_handle *handle)
return 0; return 0;
} }
static int pci_acpi_find_root_bridge(struct device *dev, acpi_handle *handle) static int acpi_pci_find_root_bridge(struct device *dev, acpi_handle *handle)
{ {
int num; int num;
unsigned int seg, bus; unsigned int seg, bus;
...@@ -299,21 +299,21 @@ static int pci_acpi_find_root_bridge(struct device *dev, acpi_handle *handle) ...@@ -299,21 +299,21 @@ static int pci_acpi_find_root_bridge(struct device *dev, acpi_handle *handle)
return 0; return 0;
} }
static struct acpi_bus_type pci_acpi_bus = { static struct acpi_bus_type acpi_pci_bus = {
.bus = &pci_bus_type, .bus = &pci_bus_type,
.find_device = pci_acpi_find_device, .find_device = acpi_pci_find_device,
.find_bridge = pci_acpi_find_root_bridge, .find_bridge = acpi_pci_find_root_bridge,
}; };
static int __init pci_acpi_init(void) static int __init acpi_pci_init(void)
{ {
int ret; int ret;
ret = register_acpi_bus_type(&pci_acpi_bus); ret = register_acpi_bus_type(&acpi_pci_bus);
if (ret) if (ret)
return 0; return 0;
platform_pci_choose_state = acpi_pci_choose_state; platform_pci_choose_state = acpi_pci_choose_state;
platform_pci_set_power_state = acpi_pci_set_power_state; platform_pci_set_power_state = acpi_pci_set_power_state;
return 0; return 0;
} }
arch_initcall(pci_acpi_init); arch_initcall(acpi_pci_init);
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