diff options
| author | Bart Van Assche <bvanassche@acm.org> | 2013-06-25 11:27:22 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-07-08 17:24:43 +0100 |
| commit | 090fc2e2cf6a2763f609af6f128a812d5051d935 (patch) | |
| tree | 4d28e73f715742e03940df6ab4d30d73d9596477 | |
| parent | 1f8deefecdda5a43961dd8062a6cab27e20af5e9 (diff) | |
| download | op-kernel-dev-090fc2e2cf6a2763f609af6f128a812d5051d935.zip op-kernel-dev-090fc2e2cf6a2763f609af6f128a812d5051d935.tar.gz | |
[SCSI] qla2xxx: Clean up qla24xx_iidma()
Remove dead code and simplify a pointer computation.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_bsg.c | 9 | ||||
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_dbg.c | 3 |
2 files changed, 3 insertions, 9 deletions
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c index 5ba0cc1..9a30b69 100644 --- a/drivers/scsi/qla2xxx/qla_bsg.c +++ b/drivers/scsi/qla2xxx/qla_bsg.c @@ -1282,14 +1282,7 @@ qla24xx_iidma(struct fc_bsg_job *bsg_job) return -EINVAL; } - port_param = (struct qla_port_param *)((char *)bsg_job->request + - sizeof(struct fc_bsg_request)); - if (!port_param) { - ql_log(ql_log_warn, vha, 0x7047, - "port_param header not provided.\n"); - return -EINVAL; - } - + port_param = (void *)bsg_job->request + sizeof(struct fc_bsg_request); if (port_param->fc_scsi_addr.dest_type != EXT_DEF_TYPE_WWPN) { ql_log(ql_log_warn, vha, 0x7048, "Invalid destination type.\n"); diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c index 3cc2105..91a1166 100644 --- a/drivers/scsi/qla2xxx/qla_dbg.c +++ b/drivers/scsi/qla2xxx/qla_dbg.c @@ -35,7 +35,8 @@ * | | | 0x70a5,0x70a6, | * | | | 0x70a8,0x70ab, | * | | | 0x70ad-0x70ae, | - * | | | 0x70d1-0x70da | + * | | | 0x70d1-0x70da, | + * | | | 0x7047 | * | Task Management | 0x803c | 0x8025-0x8026 | * | | | 0x800b,0x8039 | * | AER/EEH | 0x9011 | | |
