aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/arm/icside.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-26 14:13:03 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-26 14:13:03 -0500
commit15ce926ada545cb078711bd9a18c083c93fa01d7 (patch)
tree9496cda87cae6ef3390c5f350741ad75418dfe8d /drivers/ide/arm/icside.c
parentf37aaf9edeba3f4ae10d22aefc09c06af9ea39b6 (diff)
ide: merge ->dma_host_{on,off} methods into ->dma_host_set method
Merge ->dma_host_{on,off} methods into ->dma_host_set method which takes 'int on' argument. There should be no functionality changes caused by this patch. Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/arm/icside.c')
-rw-r--r--drivers/ide/arm/icside.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index 3a8402bb5dc3..8a5c7205b77c 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -287,11 +287,7 @@ static void icside_set_dma_mode(ide_drive_t *drive, const u8 xfer_mode)
287 ide_xfer_verbose(xfer_mode), 2000 / drive->drive_data); 287 ide_xfer_verbose(xfer_mode), 2000 / drive->drive_data);
288} 288}
289 289
290static void icside_dma_host_off(ide_drive_t *drive) 290static void icside_dma_host_set(ide_drive_t *drive, int on)
291{
292}
293
294static void icside_dma_host_on(ide_drive_t *drive)
295{ 291{
296} 292}
297 293
@@ -410,8 +406,7 @@ static void icside_dma_init(ide_hwif_t *hwif)
410 hwif->dmatable_dma = 0; 406 hwif->dmatable_dma = 0;
411 hwif->set_dma_mode = icside_set_dma_mode; 407 hwif->set_dma_mode = icside_set_dma_mode;
412 408
413 hwif->dma_host_off = icside_dma_host_off; 409 hwif->dma_host_set = icside_dma_host_set;
414 hwif->dma_host_on = icside_dma_host_on;
415 hwif->dma_setup = icside_dma_setup; 410 hwif->dma_setup = icside_dma_setup;
416 hwif->dma_exec_cmd = icside_dma_exec_cmd; 411 hwif->dma_exec_cmd = icside_dma_exec_cmd;
417 hwif->dma_start = icside_dma_start; 412 hwif->dma_start = icside_dma_start;