Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[karo-tx-linux.git] / drivers / xen / xen-acpi-memhotplug.c

diff --git a/drivers/xen/xen-acpi-memhotplug.c b/drivers/xen/xen-acpi-memhotplug.c
index 2c3759ac10f07bd6ffe804f64b1bb2a84b047db5..853b12dba5bb02556ec1e87768a67fde5e797112 100644 (file)
--- a/drivers/xen/xen-acpi-memhotplug.c
+++ b/drivers/xen/xen-acpi-memhotplug.c
@@ -65,24 +65,6 @@ static int xen_hotadd_memory(int pxm, struct acpi_memory_info *info)
        return rc;
 }
 
-static int xen_acpi_get_pxm(acpi_handle h)
-{
-       unsigned long long pxm;
-       acpi_status status;
-       acpi_handle handle;
-       acpi_handle phandle = h;
-
-       do {
-               handle = phandle;
-               status = acpi_evaluate_integer(handle, "_PXM", NULL, &pxm);
-               if (ACPI_SUCCESS(status))
-                       return pxm;
-               status = acpi_get_parent(handle, &phandle);
-       } while (ACPI_SUCCESS(status));
-
-       return -ENXIO;
-}
-
 static int xen_acpi_memory_enable_device(struct acpi_memory_device *mem_device)
 {
        int pxm, result;
@@ -206,7 +188,7 @@ acpi_memory_get_device(acpi_handle handle,
         * Now add the notified device.  This creates the acpi_device
         * and invokes .add function
         */
-       result = acpi_bus_add(&device, pdevice, handle, ACPI_BUS_TYPE_DEVICE);
+       result = acpi_bus_scan(handle);
        if (result) {
                pr_warn(PREFIX "Cannot add acpi bus\n");
                return -EINVAL;
@@ -347,7 +329,7 @@ static int xen_acpi_memory_device_add(struct acpi_device *device)
        return result;
 }
 
-static int xen_acpi_memory_device_remove(struct acpi_device *device, int type)
+static int xen_acpi_memory_device_remove(struct acpi_device *device)
 {
        struct acpi_memory_device *mem_device = NULL;