diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2008-12-04 00:24:39 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-12-29 12:24:24 -0500 |
commit | f4f4e47e4af6b02dd1c425b931c65d0165356e33 (patch) | |
tree | 1bca97ce56703d7a101674cf6bf0d28576cf7201 /drivers/scsi/ses.c | |
parent | a528ab7a324f1dbb3598ae0ecd238ab7dd974294 (diff) |
[SCSI] add residual argument to scsi_execute and scsi_execute_req
scsi_execute() and scsi_execute_req() discard the residual length
information. Some callers need it. This adds residual argument
(optional) to scsi_execute and scsi_execute_req.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/ses.c')
-rw-r--r-- | drivers/scsi/ses.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c index 1bcf3c33d7ff..7f0df29f3a64 100644 --- a/drivers/scsi/ses.c +++ b/drivers/scsi/ses.c | |||
@@ -77,7 +77,7 @@ static int ses_recv_diag(struct scsi_device *sdev, int page_code, | |||
77 | }; | 77 | }; |
78 | 78 | ||
79 | return scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buf, bufflen, | 79 | return scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buf, bufflen, |
80 | NULL, SES_TIMEOUT, SES_RETRIES); | 80 | NULL, SES_TIMEOUT, SES_RETRIES, NULL); |
81 | } | 81 | } |
82 | 82 | ||
83 | static int ses_send_diag(struct scsi_device *sdev, int page_code, | 83 | static int ses_send_diag(struct scsi_device *sdev, int page_code, |
@@ -95,7 +95,7 @@ static int ses_send_diag(struct scsi_device *sdev, int page_code, | |||
95 | }; | 95 | }; |
96 | 96 | ||
97 | result = scsi_execute_req(sdev, cmd, DMA_TO_DEVICE, buf, bufflen, | 97 | result = scsi_execute_req(sdev, cmd, DMA_TO_DEVICE, buf, bufflen, |
98 | NULL, SES_TIMEOUT, SES_RETRIES); | 98 | NULL, SES_TIMEOUT, SES_RETRIES, NULL); |
99 | if (result) | 99 | if (result) |
100 | sdev_printk(KERN_ERR, sdev, "SEND DIAGNOSTIC result: %8x\n", | 100 | sdev_printk(KERN_ERR, sdev, "SEND DIAGNOSTIC result: %8x\n", |
101 | result); | 101 | result); |
@@ -369,7 +369,8 @@ static void ses_match_to_enclosure(struct enclosure_device *edev, | |||
369 | return; | 369 | return; |
370 | 370 | ||
371 | if (scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buf, | 371 | if (scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buf, |
372 | VPD_INQUIRY_SIZE, NULL, SES_TIMEOUT, SES_RETRIES)) | 372 | VPD_INQUIRY_SIZE, NULL, SES_TIMEOUT, SES_RETRIES, |
373 | NULL)) | ||
373 | goto free; | 374 | goto free; |
374 | 375 | ||
375 | vpd_len = (buf[2] << 8) + buf[3]; | 376 | vpd_len = (buf[2] << 8) + buf[3]; |
@@ -380,7 +381,7 @@ static void ses_match_to_enclosure(struct enclosure_device *edev, | |||
380 | cmd[3] = vpd_len >> 8; | 381 | cmd[3] = vpd_len >> 8; |
381 | cmd[4] = vpd_len & 0xff; | 382 | cmd[4] = vpd_len & 0xff; |
382 | if (scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buf, | 383 | if (scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buf, |
383 | vpd_len, NULL, SES_TIMEOUT, SES_RETRIES)) | 384 | vpd_len, NULL, SES_TIMEOUT, SES_RETRIES, NULL)) |
384 | goto free; | 385 | goto free; |
385 | 386 | ||
386 | desc = buf + 4; | 387 | desc = buf + 4; |