diff options
author | Alexander Chiang <achiang@hp.com> | 2009-06-10 15:55:09 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-06-17 23:22:15 -0400 |
commit | ce597bb42aa84bc73db80509b7c37e7fbc0b75c4 (patch) | |
tree | 8298bc28f79a39fc48a8d66cfc559345478b6981 /drivers | |
parent | 07a2039b8eb0af4ff464efd3dfd95de5c02648c6 (diff) |
ACPI: make acpi_pci_bind() static
acpi_pci_root_add() explicitly assigns device->ops.bind, and later
calls acpi_pci_bind_root(), which also does the same thing.
We don't need to repeat ourselves; removing the explicit assignment
allows us to make acpi_pci_bind() static.
Signed-off-by: Alex Chiang <achiang@hp.com>
Acked-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/pci_bind.c | 3 | ||||
-rw-r--r-- | drivers/acpi/pci_root.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c index bc46de3d967f..236765c6017b 100644 --- a/drivers/acpi/pci_bind.c +++ b/drivers/acpi/pci_bind.c | |||
@@ -44,6 +44,7 @@ struct acpi_pci_data { | |||
44 | struct pci_dev *dev; | 44 | struct pci_dev *dev; |
45 | }; | 45 | }; |
46 | 46 | ||
47 | static int acpi_pci_bind(struct acpi_device *device); | ||
47 | static int acpi_pci_unbind(struct acpi_device *device); | 48 | static int acpi_pci_unbind(struct acpi_device *device); |
48 | 49 | ||
49 | static void acpi_pci_data_handler(acpi_handle handle, u32 function, | 50 | static void acpi_pci_data_handler(acpi_handle handle, u32 function, |
@@ -108,7 +109,7 @@ acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id) | |||
108 | 109 | ||
109 | EXPORT_SYMBOL(acpi_get_pci_id); | 110 | EXPORT_SYMBOL(acpi_get_pci_id); |
110 | 111 | ||
111 | int acpi_pci_bind(struct acpi_device *device) | 112 | static int acpi_pci_bind(struct acpi_device *device) |
112 | { | 113 | { |
113 | int result = 0; | 114 | int result = 0; |
114 | acpi_status status; | 115 | acpi_status status; |
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 196f97d00956..ca8dba3b40b9 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c | |||
@@ -386,8 +386,6 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device) | |||
386 | strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS); | 386 | strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS); |
387 | device->driver_data = root; | 387 | device->driver_data = root; |
388 | 388 | ||
389 | device->ops.bind = acpi_pci_bind; | ||
390 | |||
391 | /* | 389 | /* |
392 | * All supported architectures that use ACPI have support for | 390 | * All supported architectures that use ACPI have support for |
393 | * PCI domains, so we indicate this in _OSC support capabilities. | 391 | * PCI domains, so we indicate this in _OSC support capabilities. |