Re: [PATCH 22/32] ide-tape: struct idetape_packet_command_s: shorten member names

Bartlomiej Zolnierkiewicz
2008-01-27T19:34:49Z

On Sunday 27 January 2008, Borislav Petkov wrote:
> From: Borislav Petkov <bbpetkov@yahoo.de>
>
> Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de>
> ---
> drivers/ide/ide-tape.c | 88 ++++++++++++++++++++++++-----------------------
> 1 files changed, 45 insertions(+), 43 deletions(-)
>
> diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
> index b487d56..4690f71 100644
> --- a/drivers/ide/ide-tape.c
> +++ b/drivers/ide/ide-tape.c
> @@ -193,24 +193,25 @@ struct idetape_bh {
> char *b_data;
> };
>
> -/*
> - * Our view of a packet command.
> - */
> typedef struct idetape_packet_command_s {
> - u8 c[12]; /* Actual packet bytes */
> - int retries; /* On each retry, we increment retries */
> - int error; /* Error code */
> - int request_transfer; /* Bytes to transfer */
> - int actually_transferred; /* Bytes actually transferred */
> - int buffer_size; /* Size of our data buffer */
> + u8 c[12]; /* Actual packet bytes */
> + int retries; /* On each retry, we increment retries */
> + int error; /* Error code */
> + int rq_xfer; /* Request bytes to transfer */
> + int xferred; /* Bytes actually transferred */
> + int buf_size; /* Size of our data buffer */
> struct idetape_bh *bh;
> char *b_data;
> int b_count;
> - u8 *buffer; /* Data buffer */
> - u8 *current_position; /* Pointer into the above buffer */
> - ide_startstop_t (*callback) (ide_drive_t *); /* Called when this packet command is completed */
> + u8 *buffer; /* Data buffer */
> + u8 *cur_pos; /* Pointer into the above buffer */
> +
> + /* Called when this packet command is completed */
> + ide_startstop_t (*callback) (ide_drive_t *);
> u8 pc_buffer[IDETAPE_PC_BUFFER_SIZE]; /* Temporary buffer */
> - unsigned long flags; /* Status/Action bit flags: long for set_bit */
> +
> + /* Status/Action bit flags: long for set_bit */
> + unsigned long flags;
> } idetape_pc_t;

ide-{floppy,scsi} are using 'request_transfer', 'actually_transferred',
'buffer_size' and 'current_position' in their packet command structures.

We are going to unify ATAPI packet command handling for all ATAPI
device drivers and this patch is a change in the opposite direction.
(IOW I suggest to drop it until ATAPI handling gets unified).

Thanks,
Bart