Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
scsi
/
qla2xxx
/
qla_bsg.c
diff --git
a/kernel/drivers/scsi/qla2xxx/qla_bsg.c
b/kernel/drivers/scsi/qla2xxx/qla_bsg.c
index
2e2bb6f
..
c26acde
100644
(file)
--- a/
kernel/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/
kernel/drivers/scsi/qla2xxx/qla_bsg.c
@@
-405,7
+405,7
@@
done:
return rval;
}
return rval;
}
-inline uint16_t
+
static
inline uint16_t
qla24xx_calc_ct_iocbs(uint16_t dsds)
{
uint16_t iocbs;
qla24xx_calc_ct_iocbs(uint16_t dsds)
{
uint16_t iocbs;
@@
-1733,7
+1733,6
@@
qla24xx_process_bidir_cmd(struct fc_bsg_job *bsg_job)
struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host);
struct qla_hw_data *ha = vha->hw;
struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host);
struct qla_hw_data *ha = vha->hw;
- uint16_t thread_id;
uint32_t rval = EXT_STATUS_OK;
uint16_t req_sg_cnt = 0;
uint16_t rsp_sg_cnt = 0;
uint32_t rval = EXT_STATUS_OK;
uint16_t req_sg_cnt = 0;
uint16_t rsp_sg_cnt = 0;
@@
-1790,8
+1789,6
@@
qla24xx_process_bidir_cmd(struct fc_bsg_job *bsg_job)
goto done;
}
goto done;
}
- thread_id = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1];
-
mutex_lock(&ha->selflogin_lock);
if (vha->self_login_loop_id == 0) {
/* Initialize all required fields of fcport */
mutex_lock(&ha->selflogin_lock);
if (vha->self_login_loop_id == 0) {
/* Initialize all required fields of fcport */
@@
-2174,7
+2171,6
@@
qla24xx_bsg_request(struct fc_bsg_job *bsg_job)
{
int ret = -EINVAL;
struct fc_rport *rport;
{
int ret = -EINVAL;
struct fc_rport *rport;
- fc_port_t *fcport = NULL;
struct Scsi_Host *host;
scsi_qla_host_t *vha;
struct Scsi_Host *host;
scsi_qla_host_t *vha;
@@
-2183,7
+2179,6
@@
qla24xx_bsg_request(struct fc_bsg_job *bsg_job)
if (bsg_job->request->msgcode == FC_BSG_RPT_ELS) {
rport = bsg_job->rport;
if (bsg_job->request->msgcode == FC_BSG_RPT_ELS) {
rport = bsg_job->rport;
- fcport = *(fc_port_t **) rport->dd_data;
host = rport_to_shost(rport);
vha = shost_priv(host);
} else {
host = rport_to_shost(rport);
vha = shost_priv(host);
} else {