Skip to content

Commit

Permalink
ACPI: make acpi_pci_bind() static
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alexander Chiang authored and Len Brown committed Jun 18, 2009
1 parent 07a2039 commit ce597bb
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
3 changes: 2 additions & 1 deletion drivers/acpi/pci_bind.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ struct acpi_pci_data {
struct pci_dev *dev;
};

static int acpi_pci_bind(struct acpi_device *device);
static int acpi_pci_unbind(struct acpi_device *device);

static void acpi_pci_data_handler(acpi_handle handle, u32 function,
Expand Down Expand Up @@ -108,7 +109,7 @@ acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id)

EXPORT_SYMBOL(acpi_get_pci_id);

int acpi_pci_bind(struct acpi_device *device)
static int acpi_pci_bind(struct acpi_device *device)
{
int result = 0;
acpi_status status;
Expand Down
2 changes: 0 additions & 2 deletions drivers/acpi/pci_root.c
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,6 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS);
device->driver_data = root;

device->ops.bind = acpi_pci_bind;

/*
* All supported architectures that use ACPI have support for
* PCI domains, so we indicate this in _OSC support capabilities.
Expand Down
1 change: 0 additions & 1 deletion include/acpi/acpi_drivers.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ void acpi_pci_irq_del_prt(int segment, int bus);
struct pci_bus;

acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id);
int acpi_pci_bind(struct acpi_device *device);
int acpi_pci_bind_root(struct acpi_device *device, struct acpi_pci_id *id,
struct pci_bus *bus);

Expand Down

0 comments on commit ce597bb

Please sign in to comment.