forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ide-atapi: remove pc->buf

Browse source 
Now after all users of pc->buf have been converted, remove the 64B buffer
embedded in each packet command.

There should be no functional change resulting from this patch.

Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
This commit is contained in:
Borislav Petkov 2009-05-04 09:53:03 +02:00
commit 19f52a784f
5 changed files with 3 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/ide/ide-atapi.c
View file

@ -74,8 +74,6 @@ EXPORT_SYMBOL_GPL(ide_check_atapi_device);
void ide_init_pc(struct ide_atapi_pc *pc) void ide_init_pc(struct ide_atapi_pc *pc)
{ {
memset(pc, 0, sizeof(*pc)); memset(pc, 0, sizeof(*pc));
pc->buf = pc->pc_buf;
pc->buf_size = IDE_PC_BUFFER_SIZE;
} }
EXPORT_SYMBOL_GPL(ide_init_pc); EXPORT_SYMBOL_GPL(ide_init_pc);
@ -254,10 +252,6 @@ void ide_retry_pc(ide_drive_t *drive)
ide_init_pc(pc); ide_init_pc(pc);
memcpy(pc->c, sense_rq->cmd, 12); memcpy(pc->c, sense_rq->cmd, 12);
/* pointer to mapped address */
pc->buf = bio_data(sense_rq->bio);
pc->req_xfer = blk_rq_bytes(sense_rq);
if (drive->media == ide_tape) if (drive->media == ide_tape)
set_bit(IDE_AFLAG_IGNORE_DSC, &drive->atapi_flags); set_bit(IDE_AFLAG_IGNORE_DSC, &drive->atapi_flags);

8
drivers/ide/ide-floppy.c
View file

@ -210,8 +210,7 @@ static void idefloppy_create_rw_cmd(ide_drive_t *drive,
pc->rq = rq; pc->rq = rq;
if (rq->cmd_flags & REQ_RW) if (rq->cmd_flags & REQ_RW)
pc->flags |= PC_FLAG_WRITING; pc->flags |= PC_FLAG_WRITING;
pc->buf = NULL;
pc->buf_size = blk_rq_bytes(rq);
pc->flags |= PC_FLAG_DMA_OK; pc->flags |= PC_FLAG_DMA_OK;
} }
@ -226,9 +225,6 @@ static void idefloppy_blockpc_cmd(struct ide_disk_obj *floppy,
if (rq_data_dir(rq) == WRITE) if (rq_data_dir(rq) == WRITE)
pc->flags |= PC_FLAG_WRITING; pc->flags |= PC_FLAG_WRITING;
} }
/* pio will be performed by ide_pio_bytes() which handles sg fine */
pc->buf = NULL;
pc->buf_size = blk_rq_bytes(rq);
} }
static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive, static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive,
@ -388,8 +384,6 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)
drive->capacity64 = 0; drive->capacity64 = 0;
ide_floppy_create_read_capacity_cmd(&pc); ide_floppy_create_read_capacity_cmd(&pc);
pc.buf_size = sizeof(pc_buf);
if (ide_queue_pc_tail(drive, disk, &pc, pc_buf, pc.req_xfer)) { if (ide_queue_pc_tail(drive, disk, &pc, pc_buf, pc.req_xfer)) {
printk(KERN_ERR PFX "Can't get floppy parameters\n"); printk(KERN_ERR PFX "Can't get floppy parameters\n");
return 1; return 1;

1
drivers/ide/ide-floppy_ioctl.c
View file

@ -47,7 +47,6 @@ static int ide_floppy_get_format_capacities(ide_drive_t *drive,
return -EINVAL; return -EINVAL;
ide_floppy_create_read_capacity_cmd(pc); ide_floppy_create_read_capacity_cmd(pc);
pc->buf_size = sizeof(pc_buf);
if (ide_queue_pc_tail(drive, floppy->disk, pc, pc_buf, pc->req_xfer)) { if (ide_queue_pc_tail(drive, floppy->disk, pc, pc_buf, pc->req_xfer)) {
printk(KERN_ERR "ide-floppy: Can't get floppy parameters\n"); printk(KERN_ERR "ide-floppy: Can't get floppy parameters\n");

7
drivers/ide/ide-tape.c
View file

@ -568,9 +568,8 @@ static void ide_tape_create_rw_cmd(idetape_tape_t *tape,
ide_init_pc(pc); ide_init_pc(pc);
put_unaligned(cpu_to_be32(length), (unsigned int *) &pc->c[1]); put_unaligned(cpu_to_be32(length), (unsigned int *) &pc->c[1]);
pc->c[1] = 1; pc->c[1] = 1;
pc->buf = NULL;
pc->buf_size = blk_rq_bytes(rq); if (blk_rq_bytes(rq) == tape->buffer_size)
if (pc->buf_size == tape->buffer_size)
pc->flags |= PC_FLAG_DMA_OK; pc->flags |= PC_FLAG_DMA_OK;
if (opcode == READ_6) if (opcode == READ_6)
@ -1608,8 +1607,6 @@ static void idetape_get_inquiry_results(ide_drive_t *drive)
char fw_rev[4], vendor_id[8], product_id[16]; char fw_rev[4], vendor_id[8], product_id[16];
idetape_create_inquiry_cmd(&pc); idetape_create_inquiry_cmd(&pc);
pc.buf_size = sizeof(pc_buf);
if (ide_queue_pc_tail(drive, tape->disk, &pc, pc_buf, pc.req_xfer)) { if (ide_queue_pc_tail(drive, tape->disk, &pc, pc_buf, pc.req_xfer)) {
printk(KERN_ERR "ide-tape: %s: can't get INQUIRY results\n", printk(KERN_ERR "ide-tape: %s: can't get INQUIRY results\n",
tape->name); tape->name);

11
include/linux/ide.h
View file

@ -341,11 +341,6 @@ enum {
PC_FLAG_WRITING = (1 << 6), PC_FLAG_WRITING = (1 << 6),
}; };
/*
* With each packet command, we allocate a buffer of IDE_PC_BUFFER_SIZE bytes.
* This is used for several packet commands (not for READ/WRITE commands).
*/
#define IDE_PC_BUFFER_SIZE 64
#define ATAPI_WAIT_PC (60 * HZ) #define ATAPI_WAIT_PC (60 * HZ)
struct ide_atapi_pc { struct ide_atapi_pc {
@ -358,10 +353,6 @@ struct ide_atapi_pc {
/* bytes to transfer */ /* bytes to transfer */
int req_xfer; int req_xfer;
/* data buffer */
u8 *buf;
int buf_size;
/* the corresponding request */ /* the corresponding request */
struct request *rq; struct request *rq;
@ -371,8 +362,6 @@ struct ide_atapi_pc {
* those are more or less driver-specific and some of them are subject * those are more or less driver-specific and some of them are subject
* to change/removal later. * to change/removal later.
*/ */
u8 pc_buf[IDE_PC_BUFFER_SIZE];
unsigned long timeout; unsigned long timeout;
}; };