From: Stefan Richter Date: Thu, 2 Nov 2006 20:16:08 +0000 (+0100) Subject: ieee1394: sbp2: remove dead code X-Git-Tag: v2.6.20-rc1~34^2~412^2^2~30 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8c8009e69b31c60e875a348c1b032ed9543d1df6;p=linux-2.6-omap-h63xx.git ieee1394: sbp2: remove dead code This has been within #if 0 for a long time and is wrong anyway. Signed-off-by: Stefan Richter --- diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index f1f5de616d7..2b3099477e9 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c @@ -2545,21 +2545,6 @@ static void sbp2scsi_complete_command(struct scsi_id_instance_data *scsi_id, SCpnt->result = DID_BUS_BUSY << 16; } - /* - * If a unit attention occurs, return busy status so it gets - * retried... it could have happened because of a 1394 bus reset - * or hot-plug... - * XXX DID_BUS_BUSY is actually a bad idea because it will defy - * the scsi layer's retry logic. - */ -#if 0 - if ((scsi_status == SBP2_SCSI_STATUS_CHECK_CONDITION) && - (SCpnt->sense_buffer[2] == UNIT_ATTENTION)) { - SBP2_DEBUG("UNIT ATTENTION - return busy"); - SCpnt->result = DID_BUS_BUSY << 16; - } -#endif - /* * Tell scsi stack that we're done with this command */