ACPI: acpi_device_register() should call device_register()

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / scan.c

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 8ff510b91d88f4f38e473afab76425a9cf392477..b8f5c005fbb50ae0e98c105e5f3235872aecc797 100644 (file)
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -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;
        }