Merge branch 'master' into 83xx

[pandora-kernel.git] / drivers / acpi / bay.c

diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c
index 3f0ae7d..667fa1d 100644 (file)
--- a/drivers/acpi/bay.c
+++ b/drivers/acpi/bay.c
@@ -49,16 +49,14 @@ MODULE_LICENSE("GPL");
 static void bay_notify(acpi_handle handle, u32 event, void *data);
 static int acpi_bay_add(struct acpi_device *device);
 static int acpi_bay_remove(struct acpi_device *device, int type);
-static int acpi_bay_match(struct acpi_device *device,
-                               struct acpi_driver *driver);
 
 static struct acpi_driver acpi_bay_driver = {
        .name = ACPI_BAY_DRIVER_NAME,
        .class = ACPI_BAY_CLASS,
+       .ids = ACPI_BAY_HID,
        .ops = {
                .add = acpi_bay_add,
                .remove = acpi_bay_remove,
-               .match = acpi_bay_match,
                },
 };
 
@@ -69,7 +67,7 @@ struct bay {
        struct platform_device *pdev;
 };
 
-LIST_HEAD(drive_bays);
+static LIST_HEAD(drive_bays);
 
 
 /*****************************************************************************
@@ -347,20 +345,6 @@ static int acpi_bay_remove(struct acpi_device *device, int type)
        return 0;
 }
 
-static int acpi_bay_match(struct acpi_device *device,
-                               struct acpi_driver *driver)
-{
-       if (!device || !driver)
-               return -EINVAL;
-
-       if (is_ejectable_bay(device->handle)) {
-               bay_dprintk(device->handle, "matching bay device");
-               return 0;
-       }
-
-       return -ENODEV;
-}
-
 /**
  * bay_create_acpi_device - add new devices to acpi
  * @handle - handle of the device to add