diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-26 14:13:03 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-26 14:13:03 -0500 |
commit | 15ce926ada545cb078711bd9a18c083c93fa01d7 (patch) | |
tree | 9496cda87cae6ef3390c5f350741ad75418dfe8d /drivers/ide/ppc | |
parent | f37aaf9edeba3f4ae10d22aefc09c06af9ea39b6 (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/ppc')
-rw-r--r-- | drivers/ide/ppc/pmac.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index ca99b69cfac7..6a4b0d479897 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c | |||
@@ -1698,11 +1698,7 @@ pmac_ide_dma_test_irq (ide_drive_t *drive) | |||
1698 | return 1; | 1698 | return 1; |
1699 | } | 1699 | } |
1700 | 1700 | ||
1701 | static void pmac_ide_dma_host_off(ide_drive_t *drive) | 1701 | static void pmac_ide_dma_host_set(ide_drive_t *drive, int on) |
1702 | { | ||
1703 | } | ||
1704 | |||
1705 | static void pmac_ide_dma_host_on(ide_drive_t *drive) | ||
1706 | { | 1702 | { |
1707 | } | 1703 | } |
1708 | 1704 | ||
@@ -1748,13 +1744,12 @@ pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif) | |||
1748 | return; | 1744 | return; |
1749 | } | 1745 | } |
1750 | 1746 | ||
1747 | hwif->dma_host_set = &pmac_ide_dma_host_set; | ||
1751 | hwif->dma_setup = &pmac_ide_dma_setup; | 1748 | hwif->dma_setup = &pmac_ide_dma_setup; |
1752 | hwif->dma_exec_cmd = &pmac_ide_dma_exec_cmd; | 1749 | hwif->dma_exec_cmd = &pmac_ide_dma_exec_cmd; |
1753 | hwif->dma_start = &pmac_ide_dma_start; | 1750 | hwif->dma_start = &pmac_ide_dma_start; |
1754 | hwif->ide_dma_end = &pmac_ide_dma_end; | 1751 | hwif->ide_dma_end = &pmac_ide_dma_end; |
1755 | hwif->ide_dma_test_irq = &pmac_ide_dma_test_irq; | 1752 | hwif->ide_dma_test_irq = &pmac_ide_dma_test_irq; |
1756 | hwif->dma_host_off = &pmac_ide_dma_host_off; | ||
1757 | hwif->dma_host_on = &pmac_ide_dma_host_on; | ||
1758 | hwif->dma_timeout = &ide_dma_timeout; | 1753 | hwif->dma_timeout = &ide_dma_timeout; |
1759 | hwif->dma_lost_irq = &pmac_ide_dma_lost_irq; | 1754 | hwif->dma_lost_irq = &pmac_ide_dma_lost_irq; |
1760 | 1755 | ||