diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-17 02:40:23 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-17 02:40:23 +0100 |
| commit | 15b854853515e7223fd7224de53799af4a66059c (patch) | |
| tree | cf5032502ac053685cd0db036df0a662ed537c33 /drivers/ide | |
| parent | 73d4f7d5874b378fa622f156410ffba645c1ef40 (diff) | |
| download | blackbird-obmc-linux-15b854853515e7223fd7224de53799af4a66059c.tar.gz blackbird-obmc-linux-15b854853515e7223fd7224de53799af4a66059c.zip | |
cs5530: small cleanup
* BUG() on unknown DMA mode in cs5530_config_dma()
* there is no need to call hwif->ide_dma_host_{off,on}() in
cs5530_config_dma() because hwif->ide_dma_host_{off,on}()
is called by hwif->ide_dma_off_{quietly,on}()
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/pci/cs5530.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c index 9bf5fdfc5b1f..98f260196c4b 100644 --- a/drivers/ide/pci/cs5530.c +++ b/drivers/ide/pci/cs5530.c @@ -103,16 +103,13 @@ static int cs5530_config_dma (ide_drive_t *drive) int unit = drive->select.b.unit; ide_drive_t *mate = &hwif->drives[unit^1]; struct hd_driveid *id = drive->id; - unsigned int reg, timings; + unsigned int reg, timings = 0; unsigned long basereg; /* * Default to DMA-off in case we run into trouble here. */ hwif->ide_dma_off_quietly(drive); - /* turn off DMA while we fiddle */ - hwif->ide_dma_host_off(drive); - /* clear DMA_capable bit */ /* * The CS5530 specifies that two drives sharing a cable cannot @@ -182,9 +179,8 @@ static int cs5530_config_dma (ide_drive_t *drive) case XFER_MW_DMA_1: timings = 0x00012121; break; case XFER_MW_DMA_2: timings = 0x00002020; break; default: - printk(KERN_ERR "%s: cs5530_config_dma: huh? mode=%02x\n", - drive->name, mode); - return 1; /* failure */ + BUG(); + break; } basereg = CS5530_BASEREG(hwif); reg = hwif->INL(basereg+4); /* get drive0 config register */ @@ -199,8 +195,6 @@ static int cs5530_config_dma (ide_drive_t *drive) hwif->OUTL(reg, basereg+4); /* write drive0 config register */ hwif->OUTL(timings, basereg+12); /* write drive1 config register */ } - (void) hwif->ide_dma_host_on(drive); - /* set DMA_capable bit */ /* * Finally, turn DMA on in software, and exit. |
