Commit 80ffdedf6020a77adcd06c01cfe6c488312b28f8
Committed by
Len Brown
Len Brown
1 parent
d6aa484c1c
Exists in
master
and in
7 other branches
ACPI: kill acpi_get_pci_id
acpi_get_pci_dev() is better, and all callers have been converted, so eliminate acpi_get_pci_id(). 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>
Showing 2 changed files with 0 additions and 72 deletions Side-by-side Diff
drivers/acpi/pci_bind.c
| ... | ... | @@ -33,77 +33,6 @@ |
| 33 | 33 | #define _COMPONENT ACPI_PCI_COMPONENT |
| 34 | 34 | ACPI_MODULE_NAME("pci_bind"); |
| 35 | 35 | |
| 36 | -struct acpi_pci_data { | |
| 37 | - struct acpi_pci_id id; | |
| 38 | - struct pci_bus *bus; | |
| 39 | - struct pci_dev *dev; | |
| 40 | -}; | |
| 41 | - | |
| 42 | -static int acpi_pci_bind(struct acpi_device *device); | |
| 43 | -static int acpi_pci_unbind(struct acpi_device *device); | |
| 44 | - | |
| 45 | -static void acpi_pci_data_handler(acpi_handle handle, u32 function, | |
| 46 | - void *context) | |
| 47 | -{ | |
| 48 | - | |
| 49 | - /* TBD: Anything we need to do here? */ | |
| 50 | - | |
| 51 | - return; | |
| 52 | -} | |
| 53 | - | |
| 54 | -/** | |
| 55 | - * acpi_get_pci_id | |
| 56 | - * ------------------ | |
| 57 | - * This function is used by the ACPI Interpreter (a.k.a. Core Subsystem) | |
| 58 | - * to resolve PCI information for ACPI-PCI devices defined in the namespace. | |
| 59 | - * This typically occurs when resolving PCI operation region information. | |
| 60 | - */ | |
| 61 | -acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id) | |
| 62 | -{ | |
| 63 | - int result = 0; | |
| 64 | - acpi_status status = AE_OK; | |
| 65 | - struct acpi_device *device = NULL; | |
| 66 | - struct acpi_pci_data *data = NULL; | |
| 67 | - | |
| 68 | - | |
| 69 | - if (!id) | |
| 70 | - return AE_BAD_PARAMETER; | |
| 71 | - | |
| 72 | - result = acpi_bus_get_device(handle, &device); | |
| 73 | - if (result) { | |
| 74 | - printk(KERN_ERR PREFIX | |
| 75 | - "Invalid ACPI Bus context for device %s\n", | |
| 76 | - acpi_device_bid(device)); | |
| 77 | - return AE_NOT_EXIST; | |
| 78 | - } | |
| 79 | - | |
| 80 | - status = acpi_get_data(handle, acpi_pci_data_handler, (void **)&data); | |
| 81 | - if (ACPI_FAILURE(status) || !data) { | |
| 82 | - ACPI_EXCEPTION((AE_INFO, status, | |
| 83 | - "Invalid ACPI-PCI context for device %s", | |
| 84 | - acpi_device_bid(device))); | |
| 85 | - return status; | |
| 86 | - } | |
| 87 | - | |
| 88 | - *id = data->id; | |
| 89 | - | |
| 90 | - /* | |
| 91 | - id->segment = data->id.segment; | |
| 92 | - id->bus = data->id.bus; | |
| 93 | - id->device = data->id.device; | |
| 94 | - id->function = data->id.function; | |
| 95 | - */ | |
| 96 | - | |
| 97 | - ACPI_DEBUG_PRINT((ACPI_DB_INFO, | |
| 98 | - "Device %s has PCI address %04x:%02x:%02x.%d\n", | |
| 99 | - acpi_device_bid(device), id->segment, id->bus, | |
| 100 | - id->device, id->function)); | |
| 101 | - | |
| 102 | - return AE_OK; | |
| 103 | -} | |
| 104 | - | |
| 105 | -EXPORT_SYMBOL(acpi_get_pci_id); | |
| 106 | - | |
| 107 | 36 | static int acpi_pci_unbind(struct acpi_device *device) |
| 108 | 37 | { |
| 109 | 38 | struct pci_dev *dev; |
include/acpi/acpi_drivers.h
| ... | ... | @@ -99,7 +99,6 @@ |
| 99 | 99 | struct pci_bus; |
| 100 | 100 | |
| 101 | 101 | struct pci_dev *acpi_get_pci_dev(acpi_handle); |
| 102 | -acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id); | |
| 103 | 102 | int acpi_pci_bind_root(struct acpi_device *device); |
| 104 | 103 | |
| 105 | 104 | /* Arch-defined function to add a bus to the system */ |