On Wed, Mar 25, 2009 at 3:17 PM, Tejun Heo <tj@xxxxxxxxxx> wrote:
> Impact: use standard way to transfer data
>
> Now that data area is represented with bio, there is no need to use
> custom data transfer methods. Drop idetape_io_buffers() and
> idetape_update_buffers(). pc->bh is set to null to tell ide-atapi to
> use standard data transfer mechanism and idetape_bh byte counts are
> updated by the issuer on completion using the residual count.
>
> Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
> ---
> drivers/ide/ide-tape.c | 84 +++--------------------------------------------
> 1 files changed, 6 insertions(+), 78 deletions(-)
>
> diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
> index bd0e839..dd37fd7 100644
> --- a/drivers/ide/ide-tape.c
> +++ b/drivers/ide/ide-tape.c
> @@ -292,65 +292,6 @@ static struct ide_tape_obj *ide_tape_chrdev_get(unsigned int i)
> return tape;
> }
>
> -static int idetape_input_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
> - unsigned int bcount)
> -{
> - struct idetape_bh *bh = pc->bh;
> - int count;
> -
> - if (bcount && bh) {
> - count = min(
> - (unsigned int)(bh->b_size - atomic_read(&bh->b_count)),
> - bcount);
> - drive->hwif->tp_ops->input_data(drive, NULL, bh->b_data +
> - atomic_read(&bh->b_count), count);
> - bcount -= count;
> - atomic_add(count, &bh->b_count);
> - if (atomic_read(&bh->b_count) == bh->b_size)
> - pc->bh = NULL;
> - }
> -
> - return bcount;
> -}
> -
> -static int idetape_output_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
> - unsigned int bcount)
> -{
> - struct idetape_bh *bh = pc->bh;
> - int count;
> -
> - if (bcount && bh) {
> - count = min((unsigned int)pc->b_count, (unsigned int)bcount);
> - drive->hwif->tp_ops->output_data(drive, NULL, pc->b_data, count);
> - bcount -= count;
> - pc->b_data += count;
> - pc->b_count -= count;
> - if (!pc->b_count)
> - pc->bh = NULL;
> - }
> -
> - return bcount;
> -}
> -
> -static void idetape_update_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc)
> -{
> - struct idetape_bh *bh = pc->bh;
> - unsigned int bcount = pc->xferred;
> -
> - if (pc->flags & PC_FLAG_WRITING)
> - return;
> - if (bcount) {
> - if (bh == NULL || bcount > bh->b_size) {
> - printk(KERN_ERR "ide-tape: bh == NULL in %s\n",
> - __func__);
> - return;
> - }
> - atomic_set(&bh->b_count, bcount);
> - if (atomic_read(&bh->b_count) == bh->b_size)
> - pc->bh = NULL;
> - }
> -}
> -
> /*
> * called on each failed packet command retry to analyze the request sense. We
> * currently do not utilize this information.
> @@ -368,12 +309,10 @@ static void idetape_analyze_error(ide_drive_t *drive, u8 *sense)
> pc->c[0], tape->sense_key, tape->asc, tape->ascq);
>
> /* Correct pc->xferred by asking the tape. */
> - if (pc->flags & PC_FLAG_DMA_ERROR) {
> + if (pc->flags & PC_FLAG_DMA_ERROR)
> pc->xferred = pc->req_xfer -
> tape->blk_size *
> get_unaligned_be32(&sense[3]);
> - idetape_update_buffers(drive, pc);
> - }
>
> /*
> * If error was the result of a zero-length read or write command,
> @@ -520,19 +459,6 @@ static void ide_tape_handle_dsc(ide_drive_t *drive)
> idetape_postpone_request(drive);
> }
>
> -static int ide_tape_io_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
> - unsigned int bcount, int write)
> -{
> - unsigned int bleft;
> -
> - if (write)
> - bleft = idetape_output_buffers(drive, pc, bcount);
> - else
> - bleft = idetape_input_buffers(drive, pc, bcount);
> -
> - return bcount - bleft;
> -}
> -
> /*
> * Packet Command Interface
> *
> @@ -685,7 +611,7 @@ static void ide_tape_create_rw_cmd(idetape_tape_t *tape,
> ide_init_pc(pc);
> put_unaligned(cpu_to_be32(length), (unsigned int *) &pc->c[1]);
> pc->c[1] = 1;
> - pc->bh = bh;
> + pc->bh = NULL;
> pc->buf = NULL;
> pc->buf_size = length * tape->blk_size;
> pc->req_xfer = pc->buf_size;
> @@ -1083,7 +1009,11 @@ static int idetape_queue_rw_tail(ide_drive_t *drive, int cmd, int blocks,
>
> blk_execute_rq(drive->queue, tape->disk, rq, 0);
>
> + /* calculate the number of transferred bytes and update bh */
> size -= rq->data_len;
> + if (cmd == REQ_IDETAPE_READ)
> + atomic_add(size, &bh->b_count);
> +
> ret = size;
> if (rq->errors == IDE_DRV_ERROR_GENERAL)
> ret = -EIO;
> @@ -2037,8 +1967,6 @@ static void idetape_setup(ide_drive_t *drive, idetape_tape_t *tape, int minor)
> u16 *ctl = (u16 *)&tape->caps[12];
>
> drive->pc_callback = ide_tape_callback;
> - drive->pc_update_buffers = idetape_update_buffers;
> - drive->pc_io_buffers = ide_tape_io_buffers;
You might just as well remove those two ide_drive_t members since
they're used only by ide-tape.
--
Regards/Gruss,
Boris
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
