diff options
author | Shaohua Li <shaohua.li@intel.com> | 2008-08-27 22:05:45 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-09-23 23:16:41 -0400 |
commit | f730ae1838635a02aa60834762c61566911d004c (patch) | |
tree | 40318e97b65902a86e0b6eacac4bdaf7fd702fad /drivers/acpi/dock.c | |
parent | 19cd847ab24fefe9e50101ec94479e0400a08650 (diff) |
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) | |||
738 | /* Fall back */ | 738 | /* Fall back */ |
739 | case ACPI_NOTIFY_EJECT_REQUEST: | 739 | case ACPI_NOTIFY_EJECT_REQUEST: |
740 | begin_undock(ds); | 740 | begin_undock(ds); |
741 | if (immediate_undock || surprise_removal) | 741 | if ((immediate_undock && !(ds->flags & DOCK_IS_ATA)) |
742 | || surprise_removal) | ||
742 | handle_eject_request(ds, event); | 743 | handle_eject_request(ds, event); |
743 | else | 744 | else |
744 | dock_event(ds, event, UNDOCK_EVENT); | 745 | dock_event(ds, event, UNDOCK_EVENT); |