Przeglądaj źródła

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>
Alexander Chiang 16 lat temu
rodzic
commit
ce597bb42a

+ 2 - 1
drivers/acpi/pci_bind.c

@@ -44,6 +44,7 @@ struct acpi_pci_data {
 	struct pci_dev *dev;
 	struct pci_dev *dev;
 };
 };
 
 
+static int acpi_pci_bind(struct acpi_device *device);
 static int acpi_pci_unbind(struct acpi_device *device);
 static int acpi_pci_unbind(struct acpi_device *device);
 
 
 static void acpi_pci_data_handler(acpi_handle handle, u32 function,
 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)
 
 
 EXPORT_SYMBOL(acpi_get_pci_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;
 	int result = 0;
 	acpi_status status;
 	acpi_status status;

+ 0 - 2
drivers/acpi/pci_root.c

@@ -386,8 +386,6 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device)
 	strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS);
 	strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS);
 	device->driver_data = root;
 	device->driver_data = root;
 
 
-	device->ops.bind = acpi_pci_bind;
-
 	/*
 	/*
 	 * All supported architectures that use ACPI have support for
 	 * All supported architectures that use ACPI have support for
 	 * PCI domains, so we indicate this in _OSC support capabilities.
 	 * PCI domains, so we indicate this in _OSC support capabilities.

+ 0 - 1
include/acpi/acpi_drivers.h

@@ -99,7 +99,6 @@ void acpi_pci_irq_del_prt(int segment, int bus);
 struct pci_bus;
 struct pci_bus;
 
 
 acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id);
 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,
 int acpi_pci_bind_root(struct acpi_device *device, struct acpi_pci_id *id,
 		       struct pci_bus *bus);
 		       struct pci_bus *bus);