Merge branch 'acpi-misc'

[linux-2.6-microblaze.git] / drivers / acpi / device_sysfs.c

diff --git a/drivers/acpi/device_sysfs.c b/drivers/acpi/device_sysfs.c
index a07d4ad..fa2c1c9 100644 (file)
--- a/drivers/acpi/device_sysfs.c
+++ b/drivers/acpi/device_sysfs.c
@@ -377,12 +377,12 @@ eject_store(struct device *d, struct device_attribute *attr,
        if (ACPI_FAILURE(status) || !acpi_device->flags.ejectable)
                return -ENODEV;
 
-       get_device(&acpi_device->dev);
+       acpi_dev_get(acpi_device);
        status = acpi_hotplug_schedule(acpi_device, ACPI_OST_EC_OSPM_EJECT);
        if (ACPI_SUCCESS(status))
                return count;
 
-       put_device(&acpi_device->dev);
+       acpi_dev_put(acpi_device);
        acpi_evaluate_ost(acpi_device->handle, ACPI_OST_EC_OSPM_EJECT,
                          ACPI_OST_SC_NON_SPECIFIC_FAILURE, NULL);
        return status == AE_NO_MEMORY ? -ENOMEM : -EAGAIN;