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/pci/cs5520.c | |
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/pci/cs5520.c')
-rw-r--r-- | drivers/ide/pci/cs5520.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c index 2bd52af83d37..6ec00b8d7ec1 100644 --- a/drivers/ide/pci/cs5520.c +++ b/drivers/ide/pci/cs5520.c | |||
@@ -107,18 +107,10 @@ static void cs5520_set_dma_mode(ide_drive_t *drive, const u8 speed) | |||
107 | * ATAPI is harder so disable it for now using IDE_HFLAG_NO_ATAPI_DMA | 107 | * ATAPI is harder so disable it for now using IDE_HFLAG_NO_ATAPI_DMA |
108 | */ | 108 | */ |
109 | 109 | ||
110 | static void cs5520_dma_host_on(ide_drive_t *drive) | 110 | static void cs5520_dma_host_set(ide_drive_t *drive, int on) |
111 | { | 111 | { |
112 | drive->vdma = 1; | 112 | drive->vdma = on; |
113 | 113 | ide_dma_host_set(drive, on); | |
114 | ide_dma_host_on(drive); | ||
115 | } | ||
116 | |||
117 | static void cs5520_dma_host_off(ide_drive_t *drive) | ||
118 | { | ||
119 | drive->vdma = 0; | ||
120 | |||
121 | ide_dma_host_off(drive); | ||
122 | } | 114 | } |
123 | 115 | ||
124 | static void __devinit init_hwif_cs5520(ide_hwif_t *hwif) | 116 | static void __devinit init_hwif_cs5520(ide_hwif_t *hwif) |
@@ -129,8 +121,7 @@ static void __devinit init_hwif_cs5520(ide_hwif_t *hwif) | |||
129 | if (hwif->dma_base == 0) | 121 | if (hwif->dma_base == 0) |
130 | return; | 122 | return; |
131 | 123 | ||
132 | hwif->dma_host_on = &cs5520_dma_host_on; | 124 | hwif->dma_host_set = &cs5520_dma_host_set; |
133 | hwif->dma_host_off = &cs5520_dma_host_off; | ||
134 | } | 125 | } |
135 | 126 | ||
136 | #define DECLARE_CS_DEV(name_str) \ | 127 | #define DECLARE_CS_DEV(name_str) \ |