diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-15 07:23:44 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-15 07:23:44 -0500 |
commit | b17b537ac1429a609addb55bf985f5ebfcf4ae7b (patch) | |
tree | 59080b04676c60cda35a133a1d16a401646c0e73 | |
parent | 6af9a803f4d2e4137d9f74a8fc9af4857fbda001 (diff) |
ACPI / scan: Drop the second argument of acpi_device_unregister()
Drop the second argument of acpi_device_unregister(), type, which is
not used by that function.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
-rw-r--r-- | drivers/acpi/scan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index bac357da3f29..a26c09efc286 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -701,7 +701,7 @@ end: | |||
701 | return result; | 701 | return result; |
702 | } | 702 | } |
703 | 703 | ||
704 | static void acpi_device_unregister(struct acpi_device *device, int type) | 704 | static void acpi_device_unregister(struct acpi_device *device) |
705 | { | 705 | { |
706 | mutex_lock(&acpi_device_lock); | 706 | mutex_lock(&acpi_device_lock); |
707 | if (device->parent) | 707 | if (device->parent) |
@@ -1385,7 +1385,7 @@ static int acpi_bus_remove(struct acpi_device *dev, int rmdevice) | |||
1385 | if (!rmdevice) | 1385 | if (!rmdevice) |
1386 | return 0; | 1386 | return 0; |
1387 | 1387 | ||
1388 | acpi_device_unregister(dev, ACPI_BUS_REMOVAL_EJECT); | 1388 | acpi_device_unregister(dev); |
1389 | 1389 | ||
1390 | return 0; | 1390 | return 0; |
1391 | } | 1391 | } |
@@ -1746,7 +1746,7 @@ int __init acpi_scan_init(void) | |||
1746 | result = acpi_bus_scan_fixed(); | 1746 | result = acpi_bus_scan_fixed(); |
1747 | 1747 | ||
1748 | if (result) | 1748 | if (result) |
1749 | acpi_device_unregister(acpi_root, ACPI_BUS_REMOVAL_NORMAL); | 1749 | acpi_device_unregister(acpi_root); |
1750 | else | 1750 | else |
1751 | acpi_update_all_gpes(); | 1751 | acpi_update_all_gpes(); |
1752 | 1752 | ||