diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-13 15:39:43 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-13 15:39:43 -0400 |
commit | 4ab3d50224e35811b3351c28e63057595e8406e6 (patch) | |
tree | ccd1a729543defa03df97f0dc0b416f53c793dcc /drivers/ide/ide-floppy.c | |
parent | a36223b0dc14606b5c80aacbbe6288133693a841 (diff) |
ide: set IDE_AFLAG_DRQ_INTERRUPT in do_identify()
Set IDE_AFLAG_DRQ_INTERRUPT in do_identify() instead of ATAPI
device drivers *_setup() methods.
While at it:
- use ata_id_cdb_intr()
There should be no functional changes caused by this patch.
Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-floppy.c')
-rw-r--r-- | drivers/ide/ide-floppy.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 8c2b00941bd8..9f2c6b2af98f 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
@@ -578,16 +578,11 @@ static const struct ide_proc_devset idefloppy_settings[] = { | |||
578 | static void idefloppy_setup(ide_drive_t *drive, idefloppy_floppy_t *floppy) | 578 | static void idefloppy_setup(ide_drive_t *drive, idefloppy_floppy_t *floppy) |
579 | { | 579 | { |
580 | u16 *id = drive->id; | 580 | u16 *id = drive->id; |
581 | u8 gcw[2]; | ||
582 | |||
583 | *((u16 *)&gcw) = id[ATA_ID_CONFIG]; | ||
584 | 581 | ||
585 | drive->pc_callback = ide_floppy_callback; | 582 | drive->pc_callback = ide_floppy_callback; |
586 | drive->pc_update_buffers = idefloppy_update_buffers; | 583 | drive->pc_update_buffers = idefloppy_update_buffers; |
587 | drive->pc_io_buffers = ide_io_buffers; | 584 | drive->pc_io_buffers = ide_io_buffers; |
588 | 585 | ||
589 | if (((gcw[0] & 0x60) >> 5) == 1) | ||
590 | drive->atapi_flags |= IDE_AFLAG_DRQ_INTERRUPT; | ||
591 | /* | 586 | /* |
592 | * We used to check revisions here. At this point however I'm giving up. | 587 | * We used to check revisions here. At this point however I'm giving up. |
593 | * Just assume they are all broken, its easier. | 588 | * Just assume they are all broken, its easier. |