korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-11 21:14:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SCSI] ibmmca: convert to use the data buffer accessors

Browse Source 
- remove the unnecessary map_single path.

- convert to use the new accessors for the sg lists and the
parameters.

Jens Axboe <jens.axboe@oracle.com> did the for_each_sg cleanup.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
FUJITA Tomonori 2007-05-21 15:10:00 +09:00 committed by James Bottomley
parent 4c688fc7df
commit 5f60ef6ac7
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/scsi/ibmmca.c
View File

@ -555,7 +555,7 @@ static irqreturn_t interrupt_handler(int irq, void *dev_id)
printk(KERN_ERR "IBM MCA SCSI: Fatal Subsystem ERROR!\n"); printk(KERN_ERR "IBM MCA SCSI: Fatal Subsystem ERROR!\n");
printk(KERN_ERR " Last cmd=0x%x, ena=%x, len=", lastSCSI, ld(shpnt)[ldn].scb.enable); printk(KERN_ERR " Last cmd=0x%x, ena=%x, len=", lastSCSI, ld(shpnt)[ldn].scb.enable);
if (ld(shpnt)[ldn].cmd) if (ld(shpnt)[ldn].cmd)
printk("%ld/%ld,", (long) (ld(shpnt)[ldn].cmd->request_bufflen), (long) (ld(shpnt)[ldn].scb.sys_buf_length)); printk("%ld/%ld,", (long) (scsi_bufflen(ld(shpnt)[ldn].cmd)), (long) (ld(shpnt)[ldn].scb.sys_buf_length));
else else
printk("none,"); printk("none,");
if (ld(shpnt)[ldn].cmd) if (ld(shpnt)[ldn].cmd)
@ -1708,7 +1708,7 @@ static int ibmmca_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *))
int target; int target;
int max_pun; int max_pun;
int i; int i;
struct scatterlist *sl; struct scatterlist *sg;
shpnt = cmd->device->host; shpnt = cmd->device->host;
@ -1829,20 +1829,18 @@ static int ibmmca_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *))
scb->tsb_adr = isa_virt_to_bus(&(ld(shpnt)[ldn].tsb)); scb->tsb_adr = isa_virt_to_bus(&(ld(shpnt)[ldn].tsb));
scsi_cmd = cmd->cmnd[0]; scsi_cmd = cmd->cmnd[0];
if (cmd->use_sg) { if (scsi_sg_count(cmd)) {
i = cmd->use_sg; BUG_ON(scsi_sg_count(cmd) > 16);
sl = (struct scatterlist *) (cmd->request_buffer);
if (i > 16) scsi_for_each_sg(cmd, sg, scsi_sg_count(cmd), i) {
panic("IBM MCA SCSI: scatter-gather list too long.\n"); ld(shpnt)[ldn].sge[i].address = (void *) (isa_page_to_bus(sg->page) + sg->offset);
while (--i >= 0) { ld(shpnt)[ldn].sge[i].byte_length = sg->length;
ld(shpnt)[ldn].sge[i].address = (void *) (isa_page_to_bus(sl[i].page) + sl[i].offset);
ld(shpnt)[ldn].sge[i].byte_length = sl[i].length;
} }
scb->enable |= IM_POINTER_TO_LIST; scb->enable |= IM_POINTER_TO_LIST;
scb->sys_buf_adr = isa_virt_to_bus(&(ld(shpnt)[ldn].sge[0])); scb->sys_buf_adr = isa_virt_to_bus(&(ld(shpnt)[ldn].sge[0]));
scb->sys_buf_length = cmd->use_sg * sizeof(struct im_sge); scb->sys_buf_length = scsi_sg_count(cmd) * sizeof(struct im_sge);
} else { } else {
scb->sys_buf_adr = isa_virt_to_bus(cmd->request_buffer); scb->sys_buf_adr = isa_virt_to_bus(scsi_sglist(cmd));
/* recent Linux midlevel SCSI places 1024 byte for inquiry /* recent Linux midlevel SCSI places 1024 byte for inquiry
* command. Far too much for old PS/2 hardware. */ * command. Far too much for old PS/2 hardware. */
switch (scsi_cmd) { switch (scsi_cmd) {
@ -1853,16 +1851,16 @@ static int ibmmca_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *))
case REQUEST_SENSE: case REQUEST_SENSE:
case MODE_SENSE: case MODE_SENSE:
case MODE_SELECT: case MODE_SELECT:
if (cmd->request_bufflen > 255) if (scsi_bufflen(cmd) > 255)
scb->sys_buf_length = 255; scb->sys_buf_length = 255;
else else
scb->sys_buf_length = cmd->request_bufflen; scb->sys_buf_length = scsi_bufflen(cmd);
break; break;
case TEST_UNIT_READY: case TEST_UNIT_READY:
scb->sys_buf_length = 0; scb->sys_buf_length = 0;
break; break;
default: default:
scb->sys_buf_length = cmd->request_bufflen; scb->sys_buf_length = scsi_bufflen(cmd);
break; break;
} }
} }