diff options
author | FUJITA Tomonori <tomof@acm.org> | 2008-01-13 01:46:13 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-01-23 12:29:27 -0500 |
commit | b80ca4f7ee36c26d300c5a8f429e73372d153379 (patch) | |
tree | 277987f64a44e793eb35c0bde3e48b582fad445a /drivers/scsi/aic7xxx | |
parent | 94aa5e5f6251ca0e1d77e083f8c2f9f40ee548c5 (diff) |
[SCSI] replace sizeof sense_buffer with SCSI_SENSE_BUFFERSIZE
This replaces sizeof sense_buffer with SCSI_SENSE_BUFFERSIZE in
several LLDs. It's a preparation for the future changes to remove
sense_buffer array in scsi_cmnd structure.
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/aic7xxx')
-rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_osm.c | 6 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_osm.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c index 2d020405480c..0e4708fd43c8 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.c +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c | |||
@@ -1784,7 +1784,7 @@ ahd_linux_handle_scsi_status(struct ahd_softc *ahd, | |||
1784 | if (scb->flags & SCB_SENSE) { | 1784 | if (scb->flags & SCB_SENSE) { |
1785 | sense_size = min(sizeof(struct scsi_sense_data) | 1785 | sense_size = min(sizeof(struct scsi_sense_data) |
1786 | - ahd_get_sense_residual(scb), | 1786 | - ahd_get_sense_residual(scb), |
1787 | (u_long)sizeof(cmd->sense_buffer)); | 1787 | (u_long)SCSI_SENSE_BUFFERSIZE); |
1788 | sense_offset = 0; | 1788 | sense_offset = 0; |
1789 | } else { | 1789 | } else { |
1790 | /* | 1790 | /* |
@@ -1795,11 +1795,11 @@ ahd_linux_handle_scsi_status(struct ahd_softc *ahd, | |||
1795 | scb->sense_data; | 1795 | scb->sense_data; |
1796 | sense_size = min_t(size_t, | 1796 | sense_size = min_t(size_t, |
1797 | scsi_4btoul(siu->sense_length), | 1797 | scsi_4btoul(siu->sense_length), |
1798 | sizeof(cmd->sense_buffer)); | 1798 | SCSI_SENSE_BUFFERSIZE); |
1799 | sense_offset = SIU_SENSE_OFFSET(siu); | 1799 | sense_offset = SIU_SENSE_OFFSET(siu); |
1800 | } | 1800 | } |
1801 | 1801 | ||
1802 | memset(cmd->sense_buffer, 0, sizeof(cmd->sense_buffer)); | 1802 | memset(cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE); |
1803 | memcpy(cmd->sense_buffer, | 1803 | memcpy(cmd->sense_buffer, |
1804 | ahd_get_sense_buf(ahd, scb) | 1804 | ahd_get_sense_buf(ahd, scb) |
1805 | + sense_offset, sense_size); | 1805 | + sense_offset, sense_size); |
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c index 390b0fc991c5..e310e414067f 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c | |||
@@ -1801,12 +1801,12 @@ ahc_linux_handle_scsi_status(struct ahc_softc *ahc, | |||
1801 | 1801 | ||
1802 | sense_size = min(sizeof(struct scsi_sense_data) | 1802 | sense_size = min(sizeof(struct scsi_sense_data) |
1803 | - ahc_get_sense_residual(scb), | 1803 | - ahc_get_sense_residual(scb), |
1804 | (u_long)sizeof(cmd->sense_buffer)); | 1804 | (u_long)SCSI_SENSE_BUFFERSIZE); |
1805 | memcpy(cmd->sense_buffer, | 1805 | memcpy(cmd->sense_buffer, |
1806 | ahc_get_sense_buf(ahc, scb), sense_size); | 1806 | ahc_get_sense_buf(ahc, scb), sense_size); |
1807 | if (sense_size < sizeof(cmd->sense_buffer)) | 1807 | if (sense_size < SCSI_SENSE_BUFFERSIZE) |
1808 | memset(&cmd->sense_buffer[sense_size], 0, | 1808 | memset(&cmd->sense_buffer[sense_size], 0, |
1809 | sizeof(cmd->sense_buffer) - sense_size); | 1809 | SCSI_SENSE_BUFFERSIZE - sense_size); |
1810 | cmd->result |= (DRIVER_SENSE << 24); | 1810 | cmd->result |= (DRIVER_SENSE << 24); |
1811 | #ifdef AHC_DEBUG | 1811 | #ifdef AHC_DEBUG |
1812 | if (ahc_debug & AHC_SHOW_SENSE) { | 1812 | if (ahc_debug & AHC_SHOW_SENSE) { |