diff options
Diffstat (limited to 'drivers/scsi/libata-scsi.c')
-rw-r--r-- | drivers/scsi/libata-scsi.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c index 1fd3826da97e..b7df37ed4393 100644 --- a/drivers/scsi/libata-scsi.c +++ b/drivers/scsi/libata-scsi.c | |||
@@ -256,7 +256,7 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg) | |||
256 | scsi_cmd[14] = args[0]; | 256 | scsi_cmd[14] = args[0]; |
257 | 257 | ||
258 | /* Good values for timeout and retries? Values below | 258 | /* Good values for timeout and retries? Values below |
259 | from scsi_ioctl_send_command() for default case... */ | 259 | from scsi_ioctl_send_command() for default case... */ |
260 | if (scsi_execute_req(scsidev, scsi_cmd, DMA_NONE, NULL, 0, &sshdr, | 260 | if (scsi_execute_req(scsidev, scsi_cmd, DMA_NONE, NULL, 0, &sshdr, |
261 | (10*HZ), 5)) | 261 | (10*HZ), 5)) |
262 | rc = -EIO; | 262 | rc = -EIO; |
@@ -438,7 +438,7 @@ int ata_scsi_device_suspend(struct scsi_device *sdev, pm_message_t state) | |||
438 | * LOCKING: | 438 | * LOCKING: |
439 | * spin_lock_irqsave(host_set lock) | 439 | * spin_lock_irqsave(host_set lock) |
440 | */ | 440 | */ |
441 | void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk, u8 *asc, | 441 | void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk, u8 *asc, |
442 | u8 *ascq) | 442 | u8 *ascq) |
443 | { | 443 | { |
444 | int i; | 444 | int i; |
@@ -495,7 +495,7 @@ void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk, u8 *asc, | |||
495 | /* Look for drv_err */ | 495 | /* Look for drv_err */ |
496 | for (i = 0; sense_table[i][0] != 0xFF; i++) { | 496 | for (i = 0; sense_table[i][0] != 0xFF; i++) { |
497 | /* Look for best matches first */ | 497 | /* Look for best matches first */ |
498 | if ((sense_table[i][0] & drv_err) == | 498 | if ((sense_table[i][0] & drv_err) == |
499 | sense_table[i][0]) { | 499 | sense_table[i][0]) { |
500 | *sk = sense_table[i][1]; | 500 | *sk = sense_table[i][1]; |
501 | *asc = sense_table[i][2]; | 501 | *asc = sense_table[i][2]; |
@@ -518,7 +518,7 @@ void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk, u8 *asc, | |||
518 | } | 518 | } |
519 | } | 519 | } |
520 | /* No error? Undecoded? */ | 520 | /* No error? Undecoded? */ |
521 | printk(KERN_WARNING "ata%u: no sense translation for status: 0x%02x\n", | 521 | printk(KERN_WARNING "ata%u: no sense translation for status: 0x%02x\n", |
522 | id, drv_stat); | 522 | id, drv_stat); |
523 | 523 | ||
524 | /* We need a sensible error return here, which is tricky, and one | 524 | /* We need a sensible error return here, which is tricky, and one |
@@ -1150,14 +1150,14 @@ static unsigned int ata_scsi_verify_xlat(struct ata_queued_cmd *qc, const u8 *sc | |||
1150 | 1150 | ||
1151 | DPRINTK("block %u track %u cyl %u head %u sect %u\n", | 1151 | DPRINTK("block %u track %u cyl %u head %u sect %u\n", |
1152 | (u32)block, track, cyl, head, sect); | 1152 | (u32)block, track, cyl, head, sect); |
1153 | 1153 | ||
1154 | /* Check whether the converted CHS can fit. | 1154 | /* Check whether the converted CHS can fit. |
1155 | Cylinder: 0-65535 | 1155 | Cylinder: 0-65535 |
1156 | Head: 0-15 | 1156 | Head: 0-15 |
1157 | Sector: 1-255*/ | 1157 | Sector: 1-255*/ |
1158 | if ((cyl >> 16) || (head >> 4) || (sect >> 8) || (!sect)) | 1158 | if ((cyl >> 16) || (head >> 4) || (sect >> 8) || (!sect)) |
1159 | goto out_of_range; | 1159 | goto out_of_range; |
1160 | 1160 | ||
1161 | tf->command = ATA_CMD_VERIFY; | 1161 | tf->command = ATA_CMD_VERIFY; |
1162 | tf->nsect = n_block & 0xff; /* Sector count 0 means 256 sectors */ | 1162 | tf->nsect = n_block & 0xff; /* Sector count 0 means 256 sectors */ |
1163 | tf->lbal = sect; | 1163 | tf->lbal = sect; |
@@ -1289,7 +1289,7 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, const u8 *scsicm | |||
1289 | tf->lbal = block & 0xff; | 1289 | tf->lbal = block & 0xff; |
1290 | 1290 | ||
1291 | tf->device |= ATA_LBA; | 1291 | tf->device |= ATA_LBA; |
1292 | } else { | 1292 | } else { |
1293 | /* CHS */ | 1293 | /* CHS */ |
1294 | u32 sect, head, cyl, track; | 1294 | u32 sect, head, cyl, track; |
1295 | 1295 | ||
@@ -1309,8 +1309,8 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, const u8 *scsicm | |||
1309 | DPRINTK("block %u track %u cyl %u head %u sect %u\n", | 1309 | DPRINTK("block %u track %u cyl %u head %u sect %u\n", |
1310 | (u32)block, track, cyl, head, sect); | 1310 | (u32)block, track, cyl, head, sect); |
1311 | 1311 | ||
1312 | /* Check whether the converted CHS can fit. | 1312 | /* Check whether the converted CHS can fit. |
1313 | Cylinder: 0-65535 | 1313 | Cylinder: 0-65535 |
1314 | Head: 0-15 | 1314 | Head: 0-15 |
1315 | Sector: 1-255*/ | 1315 | Sector: 1-255*/ |
1316 | if ((cyl >> 16) || (head >> 4) || (sect >> 8) || (!sect)) | 1316 | if ((cyl >> 16) || (head >> 4) || (sect >> 8) || (!sect)) |
@@ -1697,7 +1697,7 @@ unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf, | |||
1697 | 1697 | ||
1698 | if (buflen > (ATA_SERNO_LEN + num + 3)) { | 1698 | if (buflen > (ATA_SERNO_LEN + num + 3)) { |
1699 | /* piv=0, assoc=lu, code_set=ACSII, designator=vendor */ | 1699 | /* piv=0, assoc=lu, code_set=ACSII, designator=vendor */ |
1700 | rbuf[num + 0] = 2; | 1700 | rbuf[num + 0] = 2; |
1701 | rbuf[num + 3] = ATA_SERNO_LEN; | 1701 | rbuf[num + 3] = ATA_SERNO_LEN; |
1702 | num += 4; | 1702 | num += 4; |
1703 | ata_id_string(args->id, (unsigned char *) rbuf + num, | 1703 | ata_id_string(args->id, (unsigned char *) rbuf + num, |
@@ -1707,8 +1707,8 @@ unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf, | |||
1707 | if (buflen > (sat_model_serial_desc_len + num + 3)) { | 1707 | if (buflen > (sat_model_serial_desc_len + num + 3)) { |
1708 | /* SAT defined lu model and serial numbers descriptor */ | 1708 | /* SAT defined lu model and serial numbers descriptor */ |
1709 | /* piv=0, assoc=lu, code_set=ACSII, designator=t10 vendor id */ | 1709 | /* piv=0, assoc=lu, code_set=ACSII, designator=t10 vendor id */ |
1710 | rbuf[num + 0] = 2; | 1710 | rbuf[num + 0] = 2; |
1711 | rbuf[num + 1] = 1; | 1711 | rbuf[num + 1] = 1; |
1712 | rbuf[num + 3] = sat_model_serial_desc_len; | 1712 | rbuf[num + 3] = sat_model_serial_desc_len; |
1713 | num += 4; | 1713 | num += 4; |
1714 | memcpy(rbuf + num, "ATA ", 8); | 1714 | memcpy(rbuf + num, "ATA ", 8); |