aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/scan.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r--drivers/acpi/scan.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 06b86faf037f..c566c74e8a31 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -866,11 +866,6 @@ static int acpi_bus_remove(struct acpi_device *dev, int rmdevice)
866 if (!rmdevice) 866 if (!rmdevice)
867 return 0; 867 return 0;
868 868
869 if (dev->flags.bus_address) {
870 if ((dev->parent) && (dev->parent->ops.unbind))
871 dev->parent->ops.unbind(dev);
872 }
873
874 acpi_device_unregister(dev, ACPI_BUS_REMOVAL_EJECT); 869 acpi_device_unregister(dev, ACPI_BUS_REMOVAL_EJECT);
875 870
876 return 0; 871 return 0;
@@ -987,18 +982,6 @@ acpi_add_single_object(struct acpi_device **child,
987 982
988 acpi_device_register(device, parent); 983 acpi_device_register(device, parent);
989 984
990 /*
991 * Bind _ADR-Based Devices
992 * -----------------------
993 * If there's a a bus address (_ADR) then we utilize the parent's
994 * 'bind' function (if exists) to bind the ACPI- and natively-
995 * enumerated device representations.
996 */
997 if (device->flags.bus_address) {
998 if (device->parent && device->parent->ops.bind)
999 device->parent->ops.bind(device);
1000 }
1001
1002 end: 985 end:
1003 if (!result) 986 if (!result)
1004 *child = device; 987 *child = device;