diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-15 13:23:44 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-15 13:23:44 +0100 |
| commit | b17b537ac1429a609addb55bf985f5ebfcf4ae7b (patch) | |
| tree | 59080b04676c60cda35a133a1d16a401646c0e73 /drivers/acpi/scan.c | |
| parent | ACPI: Remove the ops field from struct acpi_device (diff) | |
| download | linux-dev-b17b537ac1429a609addb55bf985f5ebfcf4ae7b.tar.xz linux-dev-b17b537ac1429a609addb55bf985f5ebfcf4ae7b.zip | |
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>
Diffstat (limited to '')
| -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: return result; } -static void acpi_device_unregister(struct acpi_device *device, int type) +static void acpi_device_unregister(struct acpi_device *device) { mutex_lock(&acpi_device_lock); if (device->parent) @@ -1385,7 +1385,7 @@ static int acpi_bus_remove(struct acpi_device *dev, int rmdevice) if (!rmdevice) return 0; - acpi_device_unregister(dev, ACPI_BUS_REMOVAL_EJECT); + acpi_device_unregister(dev); return 0; } @@ -1746,7 +1746,7 @@ int __init acpi_scan_init(void) result = acpi_bus_scan_fixed(); if (result) - acpi_device_unregister(acpi_root, ACPI_BUS_REMOVAL_NORMAL); + acpi_device_unregister(acpi_root); else acpi_update_all_gpes(); |