diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:47 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:47 -0400 |
commit | 22117d6eaac50d366d9013c88318a869ea4d8739 (patch) | |
tree | 7dae55b028f8c7c249341f026257f94c88eed3cf /drivers/ide/ide-dma.c | |
parent | 60c0cd02b254805691cdc61101ada6af7bd56fde (diff) |
ide: add ->dma_timer_expiry method and remove ->dma_exec_cmd one (v2)
* Rename dma_timer_expiry() to ide_dma_sff_timer_expiry() and export it.
* Add ->dma_timer_expiry method and use it to set hwif->expiry for
ATA_PROT_DMA protocol in do_rw_taskfile().
* Initialize ->dma_timer_expiry to ide_dma_sff_timer_expiry() for SFF hosts.
* Move setting hwif->expiry from ide_execute_command() to its users and drop
'expiry' argument.
* Use ide_execute_command() instead of ->dma_exec_cmd in do_rw_taskfile().
* Remove ->dma_exec_cmd method and its implementations.
* Unexport ide_execute_command() and ide_dma_intr().
v2:
* Fix CONFIG_BLK_DEV_IDEDMA=n build (noticed by Randy Dunlap).
* Fix *dma_expiry naming (suggested by Sergei Shtylyov).
There should be no functional changes caused by this patch.
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-dma.c')
-rw-r--r-- | drivers/ide/ide-dma.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index ad4edab9b0a9..3dbf80c15491 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
@@ -110,7 +110,6 @@ ide_startstop_t ide_dma_intr(ide_drive_t *drive) | |||
110 | } | 110 | } |
111 | return ide_error(drive, "dma_intr", stat); | 111 | return ide_error(drive, "dma_intr", stat); |
112 | } | 112 | } |
113 | EXPORT_SYMBOL_GPL(ide_dma_intr); | ||
114 | 113 | ||
115 | int ide_dma_good_drive(ide_drive_t *drive) | 114 | int ide_dma_good_drive(ide_drive_t *drive) |
116 | { | 115 | { |