aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-floppy.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-25 16:17:12 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-25 16:17:12 -0500
commite5f9f5a89a01abc2b9c09747452aeb9218d6bffd (patch)
tree6a09f9be2ccbc27ef0baf0001719a70240c02537 /drivers/ide/ide-floppy.c
parent0e38a66a1e69821ab57a06d5a7b11f0df9275bf4 (diff)
ide: remove atapi_feature_t
Remove atapi_feature_t. While at it: * replace 'HWIF(drive)' by 'hwif' Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-floppy.c')
-rw-r--r--drivers/ide/ide-floppy.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 2a37a08ddd57..95e302790001 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -1019,9 +1019,9 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p
1019{ 1019{
1020 idefloppy_floppy_t *floppy = drive->driver_data; 1020 idefloppy_floppy_t *floppy = drive->driver_data;
1021 ide_hwif_t *hwif = drive->hwif; 1021 ide_hwif_t *hwif = drive->hwif;
1022 atapi_feature_t feature;
1023 atapi_bcount_t bcount; 1022 atapi_bcount_t bcount;
1024 ide_handler_t *pkt_xfer_routine; 1023 ide_handler_t *pkt_xfer_routine;
1024 u8 dma;
1025 1025
1026 if (floppy->failed_pc == NULL && 1026 if (floppy->failed_pc == NULL &&
1027 pc->c[0] != IDEFLOPPY_REQUEST_SENSE_CMD) 1027 pc->c[0] != IDEFLOPPY_REQUEST_SENSE_CMD)
@@ -1064,20 +1064,20 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p
1064 if (test_and_clear_bit(PC_DMA_ERROR, &pc->flags)) 1064 if (test_and_clear_bit(PC_DMA_ERROR, &pc->flags))
1065 ide_dma_off(drive); 1065 ide_dma_off(drive);
1066 1066
1067 feature.all = 0; 1067 dma = 0;
1068 1068
1069 if (test_bit(PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma) 1069 if (test_bit(PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma)
1070 feature.b.dma = !hwif->dma_setup(drive); 1070 dma = !hwif->dma_setup(drive);
1071 1071
1072 if (IDE_CONTROL_REG) 1072 if (IDE_CONTROL_REG)
1073 HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG); 1073 HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG);
1074 /* Use PIO/DMA */ 1074 /* Use PIO/DMA */
1075 HWIF(drive)->OUTB(feature.all, IDE_FEATURE_REG); 1075 hwif->OUTB(dma, IDE_FEATURE_REG);
1076 HWIF(drive)->OUTB(bcount.b.high, IDE_BCOUNTH_REG); 1076 HWIF(drive)->OUTB(bcount.b.high, IDE_BCOUNTH_REG);
1077 HWIF(drive)->OUTB(bcount.b.low, IDE_BCOUNTL_REG); 1077 HWIF(drive)->OUTB(bcount.b.low, IDE_BCOUNTL_REG);
1078 HWIF(drive)->OUTB(drive->select.all, IDE_SELECT_REG); 1078 HWIF(drive)->OUTB(drive->select.all, IDE_SELECT_REG);
1079 1079
1080 if (feature.b.dma) { /* Begin DMA, if necessary */ 1080 if (dma) { /* Begin DMA, if necessary */
1081 set_bit(PC_DMA_IN_PROGRESS, &pc->flags); 1081 set_bit(PC_DMA_IN_PROGRESS, &pc->flags);
1082 hwif->dma_start(drive); 1082 hwif->dma_start(drive);
1083 } 1083 }