diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-13 15:39:32 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-13 15:39:32 -0400 |
commit | 85e39035ca381846b031690f4d1ac1f0660da0a2 (patch) | |
tree | ebdf6b4b173e3e11ce876b8b7b91651a60945f91 /drivers/ide/ide-floppy.c | |
parent | 6b0da28b2d0f4f4e2c55689fc062db569075ff60 (diff) |
ide: add ->pc_{update,io}_buffers methods
Add ->pc_{update,io}_buffers methods to ide_drive_t and use
them instead of {update,io}_buffers ide_pc_intr() arguments.
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 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 6e62ffafc562..378a22ca55c1 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
@@ -196,8 +196,7 @@ static void ide_floppy_callback(ide_drive_t *drive, int dsc) | |||
196 | /* The usual interrupt handler called during a packet command. */ | 196 | /* The usual interrupt handler called during a packet command. */ |
197 | static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive) | 197 | static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive) |
198 | { | 198 | { |
199 | return ide_pc_intr(drive, idefloppy_pc_intr, idefloppy_update_buffers, | 199 | return ide_pc_intr(drive, idefloppy_pc_intr); |
200 | ide_io_buffers); | ||
201 | } | 200 | } |
202 | 201 | ||
203 | /* | 202 | /* |
@@ -636,7 +635,9 @@ static void idefloppy_setup(ide_drive_t *drive, idefloppy_floppy_t *floppy) | |||
636 | 635 | ||
637 | *((u16 *)&gcw) = id[ATA_ID_CONFIG]; | 636 | *((u16 *)&gcw) = id[ATA_ID_CONFIG]; |
638 | 637 | ||
639 | drive->pc_callback = ide_floppy_callback; | 638 | drive->pc_callback = ide_floppy_callback; |
639 | drive->pc_update_buffers = idefloppy_update_buffers; | ||
640 | drive->pc_io_buffers = ide_io_buffers; | ||
640 | 641 | ||
641 | if (((gcw[0] & 0x60) >> 5) == 1) | 642 | if (((gcw[0] & 0x60) >> 5) == 1) |
642 | drive->atapi_flags |= IDE_AFLAG_DRQ_INTERRUPT; | 643 | drive->atapi_flags |= IDE_AFLAG_DRQ_INTERRUPT; |