From 20332e349d8240cdce9e511f3d58d2b582097220 Mon Sep 17 00:00:00 2001 From: Oleksij Rempel Date: Fri, 4 May 2012 17:14:27 +0200 Subject: [PATCH] --- yaml --- r: 304565 b: refs/heads/master c: d705b84c6e44d8d1fe0dafe34a20a12846ab07ed h: refs/heads/master i: 304563: a16b33e5c0b09eebd594a0de11e516a39ed20fca v: v3 --- [refs] | 2 +- trunk/drivers/staging/rts5139/rts51x_scsi.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 14b9f5a5162c..7db3057928e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f00e6eac6473d933245c144542c615d83272458 +refs/heads/master: d705b84c6e44d8d1fe0dafe34a20a12846ab07ed diff --git a/trunk/drivers/staging/rts5139/rts51x_scsi.c b/trunk/drivers/staging/rts5139/rts51x_scsi.c index 87c9cdc8bd29..9625adc03e85 100644 --- a/trunk/drivers/staging/rts5139/rts51x_scsi.c +++ b/trunk/drivers/staging/rts5139/rts51x_scsi.c @@ -883,20 +883,12 @@ static int read_write(struct scsi_cmnd *srb, struct rts51x_chip *chip) retval = card_rw(srb, chip, start_sec, sec_cnt); if (retval != STATUS_SUCCESS) { -#if 0 - if (chip->need_release & chip->lun2card[lun]) { - set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT); - } else { -#endif if (srb->sc_data_direction == DMA_FROM_DEVICE) { set_sense_type(chip, lun, SENSE_TYPE_MEDIA_UNRECOVER_READ_ERR); } else { set_sense_type(chip, lun, SENSE_TYPE_MEDIA_WRITE_ERR); } -#if 0 - } -#endif TRACE_RET(chip, TRANSPORT_FAILED); } @@ -2111,14 +2103,7 @@ int queuecommand_lck(struct scsi_cmnd *srb, void (*done) (struct scsi_cmnd *)) return 0; } -#if 0 /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37) */ -int queuecommand(struct scsi_cmnd *srb, void (*done) (struct scsi_cmnd *)) -{ - return queuecommand_lck(srb, done); -} -#else DEF_SCSI_QCMD(queuecommand) -#endif /*********************************************************************** * Error handling functions ***********************************************************************/