Commit 8b12b922 authored by Alex Chiang's avatar Alex Chiang Committed by Len Brown
Browse files

ACPI: acpi_device_register() should call device_register() 



There is no apparent reason for acpi_device_register() to manually
register a new device in two steps (initialize then add).

Just call device_register() directly.

Signed-off-by: default avatarAlex Chiang <achiang@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent ab46feae

drivers/acpi/scan.c

+2 −3
Original line number Diff line number Diff line
@@ -530,11 +530,10 @@ static int acpi_device_register(struct acpi_device *device, 
	if (device->parent)

		device->dev.parent = &parent->dev;

	device->dev.bus = &acpi_bus_type;

	device_initialize(&device->dev);

	device->dev.release = &acpi_device_release;

	result = device_add(&device->dev);

	result = device_register(&device->dev);

	if(result) {

		dev_err(&device->dev, "Error adding device\n");

		dev_err(&device->dev, "Error registering device\n");

		goto end;

	}