summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/bay.c
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2007-01-11 02:09:09 -0500
committerLen Brown <len.brown@intel.com>2007-02-03 01:14:56 -0500
commit547352660506ab99d6b0bad58dea495bf3718cee (patch)
tree2fdfca6c709015fd1266b9bb44f1bfba50f5e069 /drivers/acpi/bay.c
parent975a8e3ed2b9eab9f062a1e0ba7fe180e15204e1 (diff)
downloadlinux-547352660506ab99d6b0bad58dea495bf3718cee.tar.gz
linux-547352660506ab99d6b0bad58dea495bf3718cee.tar.bz2
linux-547352660506ab99d6b0bad58dea495bf3718cee.zip
ACPI: bay: Convert ACPI Bay driver to be compatible with sysfs update.
Set fake hid for ejectable drive bay. Match bay devices by checking the hid. Remove .match method of Bay driver. Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/bay.c')
-rw-r--r--drivers/acpi/bay.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c
index aa1b131c0fce..667fa1dfa1a3 100644
--- 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,
},
};
@@ -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