lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] scsi_debug: remove unnecessary condition test in devInfoReg

Browse Source 
open_devip is always non NULL.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Douglas Gilbert <dougg@torque.net>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
FUJITA Tomonori
2008-03-20 11:09:17 +09:00
committed by James Bottomley
parent 5cb2fc0610
commit a75869d1ff
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/scsi/scsi_debug.c
View File

@@ -2059,25 +2059,24 @@ static struct sdebug_dev_info * devInfoReg(struct scsi_device * sdev)
return NULL; return NULL;
} }
} }
if (open_devip) {
open_devip->channel = sdev->channel; open_devip->channel = sdev->channel;
open_devip->target = sdev->id; open_devip->target = sdev->id;
open_devip->lun = sdev->lun; open_devip->lun = sdev->lun;
open_devip->sdbg_host = sdbg_host; open_devip->sdbg_host = sdbg_host;
open_devip->reset = 1; open_devip->reset = 1;
open_devip->used = 1; open_devip->used = 1;
memset(open_devip->sense_buff, 0, SDEBUG_SENSE_LEN); memset(open_devip->sense_buff, 0, SDEBUG_SENSE_LEN);
if (scsi_debug_dsense) if (scsi_debug_dsense)
open_devip->sense_buff[0] = 0x72; open_devip->sense_buff[0] = 0x72;
else { else {
open_devip->sense_buff[0] = 0x70; open_devip->sense_buff[0] = 0x70;
open_devip->sense_buff[7] = 0xa; open_devip->sense_buff[7] = 0xa;
} }
if (sdev->lun == SAM2_WLUN_REPORT_LUNS) if (sdev->lun == SAM2_WLUN_REPORT_LUNS)
open_devip->wlun = SAM2_WLUN_REPORT_LUNS & 0xff; open_devip->wlun = SAM2_WLUN_REPORT_LUNS & 0xff;
return open_devip;
} return open_devip;
return NULL;
} }
static void mk_sense_buffer(struct sdebug_dev_info * devip, int key, static void mk_sense_buffer(struct sdebug_dev_info * devip, int key,