ide: add ide_atapi_{discard_data,write_zeros} inline helpers
PATCH 2/3 ide: add ide_atapi_{discard_data,write_zeros} inline helpers
Add ide_atapi_{discard_data,write_zeros} inline helpers to <linux/ide.h> and use them instead of home-brewn helpers in ide-{floppy,tape,scsi}.
There should be no functional changes caused by this patch.
Cc Borislav Petkov <[email protected]>
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/ide/ide-floppy.c | 24 +++--------------------- drivers/ide/ide-tape.c | 14 ++------------ drivers/scsi/ide-scsi.c | 18 +++--------------- include/linux/ide.h | 22 ++++++++++++++++++++++ 4 files changed, 30 insertions(+), 48 deletions(-)
drivers/ide/ide-floppy.c +3 -21
@@ -230,23 +230,6 @@ static void ide_floppy_put(struct ide_fl }/* -* Too bad. The drive wants to send us data which we are not ready to accept. -* Just throw it away. -*/ -static void idefloppy_discard_data (ide_drive_t *drive,unsigned int bcount) -{ -while (bcount--) - (void )HWIF (drive)->INB (IDE_DATA_REG ); -} - -static void idefloppy_write_zeros (ide_drive_t *drive,unsigned int bcount) -{ -while (bcount--) -HWIF (drive)->OUTB (0 ,IDE_DATA_REG ); -} - - -/* * Used to finish servicing a request. For read/write requests, we will call * ide_end_request to pass to the next buffer. */
@@ -313,10 +296,9 @@ static void ide_floppy_io_buffers(ide_drprintk (KERN_ERR "%s: leftover data in %s, bcount == %d\n" , drive->name, __func__, bcount);if (direction) -idefloppy_write_zeros (drive, bcount); +ide_atapi_write_zeros (drive, bcount);else -idefloppy_discard_data (drive, bcount); - +ide_atapi_discard_data (drive, bcount); } }
@@ -541,7 +523,7 @@ static ide_startstop_t idefloppy_pc_intrprintk (KERN_ERR "ide-floppy: The floppy wants " "to send us more data than expected " "- discarding data\n" ); -idefloppy_discard_data (drive, bcount); +ide_atapi_discard_data (drive, bcount); ide_set_handler(drive, &idefloppy_pc_intr,
drivers/ide/ide-tape.c +2 -12
@@ -518,16 +518,6 @@ static struct ide_tape_obj *ide_tape_chrreturn tape; } -/* -* Too bad. The drive wants to send us data which we are not ready to accept. -* Just throw it away. -*/ -static void idetape_discard_data (ide_drive_t *drive,unsigned int bcount) -{ -while (bcount--) - (void )HWIF (drive)->INB (IDE_DATA_REG ); -} -static void idetape_input_buffers (ide_drive_t *drive,idetape_pc_t *pc,unsigned int bcount) {
@@ -538,7 +528,7 @@ static void idetape_input_buffers(ide_drif (bh ==NULL ) {printk (KERN_ERR "ide-tape: bh == NULL in " "idetape_input_buffers\n" ); -idetape_discard_data (drive, bcount); +ide_atapi_discard_data (drive, bcount);return ; } count = min(
@@ -1152,7 +1142,7 @@ static ide_startstop_t idetape_pc_intr(iprintk (KERN_ERR "ide-tape: The tape wants to " "send us more data than expected " "- discarding data\n" ); -idetape_discard_data (drive, bcount); +ide_atapi_discard_data (drive, bcount);ide_set_handler (drive, &idetape_pc_intr,IDETAPE_WAIT_CMD ,NULL );return ide_started;
drivers/scsi/ide-scsi.c +3 -15
@@ -152,18 +152,6 @@ static inline idescsi_scsi_t *drive_to_i*/ #define IDESCSI_PC_RQ 90 -static void idescsi_discard_data (ide_drive_t *drive,unsigned int bcount) -{ -while (bcount--) - (void )HWIF (drive)->INB (IDE_DATA_REG ); -} - -static void idescsi_output_zeros (ide_drive_t *drive,unsigned int bcount) -{ -while (bcount--) -HWIF (drive)->OUTB (0 ,IDE_DATA_REG ); -} -/* * PIO data transfer routines using the scatter gather table. */
@@ -200,7 +188,7 @@ static void idescsi_input_buffers (ide_dif (bcount) {printk (KERN_ERR "ide-scsi: scatter gather table too small, discarding data\n" ); -idescsi_discard_data (drive, bcount); +ide_atapi_discard_data (drive, bcount); } }
@@ -237,7 +225,7 @@ static void idescsi_output_buffers (ide_if (bcount) {printk (KERN_ERR "ide-scsi: scatter gather table too small, padding with zeros\n" ); -idescsi_output_zeros (drive, bcount); +ide_atapi_write_zeros (drive, bcount); } }
@@ -463,7 +451,7 @@ static ide_startstop_t idescsi_pc_intr ( } pc->actually_transferred += temp; pc->current_position += temp; -idescsi_discard_data (drive, bcount - temp); +ide_atapi_discard_data (drive, bcount - temp);ide_set_handler (drive, &idescsi_pc_intr,get_timeout (pc), idescsi_expiry);return ide_started; }
include/linux/ide.h +22 -0
@@ -1299,4 +1299,26 @@ static inline u8 ide_read_error(ide_driv return hwif->INB(hwif->io_ports[IDE_ERROR_OFFSET]); } +/* +* Too bad. The drive wants to send us data which we are not ready to accept. +* Just throw it away. +*/ +static inline void ide_atapi_discard_data (ide_drive_t *drive,unsigned bcount) +{ +ide_hwif_t *hwif = drive->hwif; + +/* FIXME: use ->atapi_input_bytes */ +while (bcount--) + (void )hwif->INB (hwif->io_ports[IDE_DATA_OFFSET ]); +} + +static inline void ide_atapi_write_zeros (ide_drive_t *drive,unsigned bcount) +{ +ide_hwif_t *hwif = drive->hwif; + +/* FIXME: use ->atapi_output_bytes */ +while (bcount--) + hwif->OUTB (0 , hwif->io_ports[IDE_DATA_OFFSET ]); +} +#endif /* _IDE_H */