diff options
| author | Shaohua Li <shaohua.li@intel.com> | 2008-08-28 04:05:45 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-09-24 05:16:41 +0200 |
| commit | f730ae1838635a02aa60834762c61566911d004c (patch) | |
| tree | 40318e97b65902a86e0b6eacac4bdaf7fd702fad /drivers/acpi/dock.c | |
| parent | ACPI: fix hotplug race (diff) | |
| download | linux-f730ae1838635a02aa60834762c61566911d004c.tar.xz linux-f730ae1838635a02aa60834762c61566911d004c.zip | |
libata: remove functions now handed by ACPI dock driver
dock driver can handle ata(bay) hotplug now. dock driver already handles
_EJ0 and _STA, so remove them. Also libata doesn't need register
notification handler anymore.
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Acked-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/dock.c')
| -rw-r--r-- | drivers/acpi/dock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 4b395b1e61b2..f19f643fb362 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -738,7 +738,8 @@ static void dock_notify(acpi_handle handle, u32 event, void *data) /* Fall back */ case ACPI_NOTIFY_EJECT_REQUEST: begin_undock(ds); - if (immediate_undock || surprise_removal) + if ((immediate_undock && !(ds->flags & DOCK_IS_ATA)) + || surprise_removal) handle_eject_request(ds, event); else dock_event(ds, event, UNDOCK_EVENT); |