scsi: fc: use bsg_job_done
fc_bsg_jobdone() and bsg_job_done() are 1:1 copies now so use the bsg-lib one instead of the FC private implementation. Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> Reviewed-by: Hannes Reinecke <hare@suse.com> Acked-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Johannes Thumshirn
committed by
Martin K. Petersen
Martin K. Petersen
parent
6aa858cd33
commit
06548160df
@@ -21,7 +21,7 @@ qla2x00_bsg_job_done(void *data, void *ptr, int res)
|
||||
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
|
||||
|
||||
bsg_reply->result = res;
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
sp->free(vha, sp);
|
||||
}
|
||||
@@ -244,7 +244,7 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct bsg_job *bsg_job)
|
||||
}
|
||||
exit_fcp_prio_cfg:
|
||||
if (!ret)
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
return ret;
|
||||
}
|
||||
@@ -942,7 +942,7 @@ done_unmap_req_sg:
|
||||
bsg_job->request_payload.sg_list,
|
||||
bsg_job->request_payload.sg_cnt, DMA_TO_DEVICE);
|
||||
if (!rval)
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
return rval;
|
||||
}
|
||||
@@ -976,7 +976,7 @@ qla84xx_reset(struct bsg_job *bsg_job)
|
||||
ql_dbg(ql_dbg_user, vha, 0x7031,
|
||||
"Vendor request 84xx reset completed.\n");
|
||||
bsg_reply->result = DID_OK;
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
}
|
||||
|
||||
@@ -1090,7 +1090,7 @@ done_unmap_sg:
|
||||
bsg_job->request_payload.sg_cnt, DMA_TO_DEVICE);
|
||||
|
||||
if (!rval)
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
return rval;
|
||||
}
|
||||
@@ -1288,7 +1288,7 @@ exit_mgmt:
|
||||
dma_pool_free(ha->s_dma_pool, mn, mn_dma);
|
||||
|
||||
if (!rval)
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
return rval;
|
||||
}
|
||||
@@ -1375,7 +1375,7 @@ qla24xx_iidma(struct bsg_job *bsg_job)
|
||||
}
|
||||
|
||||
bsg_reply->result = DID_OK;
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
}
|
||||
|
||||
@@ -1484,7 +1484,7 @@ qla2x00_read_optrom(struct bsg_job *bsg_job)
|
||||
ha->optrom_buffer = NULL;
|
||||
ha->optrom_state = QLA_SWAITING;
|
||||
mutex_unlock(&ha->optrom_mutex);
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
return rval;
|
||||
}
|
||||
@@ -1520,7 +1520,7 @@ qla2x00_update_optrom(struct bsg_job *bsg_job)
|
||||
ha->optrom_buffer = NULL;
|
||||
ha->optrom_state = QLA_SWAITING;
|
||||
mutex_unlock(&ha->optrom_mutex);
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
return rval;
|
||||
}
|
||||
@@ -1571,7 +1571,7 @@ dealloc:
|
||||
done:
|
||||
bsg_job->reply_len = sizeof(struct fc_bsg_reply);
|
||||
bsg_reply->result = DID_OK << 16;
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
|
||||
return 0;
|
||||
@@ -1621,7 +1621,7 @@ done:
|
||||
bsg_job->reply_len = sizeof(struct fc_bsg_reply);
|
||||
bsg_reply->reply_payload_rcv_len = sizeof(*sr);
|
||||
bsg_reply->result = DID_OK << 16;
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
|
||||
return 0;
|
||||
@@ -1667,7 +1667,7 @@ dealloc:
|
||||
done:
|
||||
bsg_job->reply_len = sizeof(struct fc_bsg_reply);
|
||||
bsg_reply->result = DID_OK << 16;
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
|
||||
return 0;
|
||||
@@ -1712,7 +1712,7 @@ dealloc:
|
||||
done:
|
||||
bsg_job->reply_len = sizeof(struct fc_bsg_reply);
|
||||
bsg_reply->result = DID_OK << 16;
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
|
||||
return 0;
|
||||
@@ -1761,7 +1761,7 @@ done:
|
||||
bsg_job->reply_len = sizeof(struct fc_bsg_reply);
|
||||
bsg_reply->reply_payload_rcv_len = sizeof(*i2c);
|
||||
bsg_reply->result = DID_OK << 16;
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
|
||||
return 0;
|
||||
@@ -1940,7 +1940,7 @@ done:
|
||||
bsg_job->reply_len = sizeof(struct fc_bsg_reply);
|
||||
bsg_reply->reply_payload_rcv_len = 0;
|
||||
bsg_reply->result = (DID_OK) << 16;
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
/* Always return success, vendor rsp carries correct status */
|
||||
return 0;
|
||||
@@ -2106,7 +2106,7 @@ qla26xx_serdes_op(struct bsg_job *bsg_job)
|
||||
|
||||
bsg_job->reply_len = sizeof(struct fc_bsg_reply);
|
||||
bsg_reply->result = DID_OK << 16;
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
return 0;
|
||||
}
|
||||
@@ -2148,7 +2148,7 @@ qla8044_serdes_op(struct bsg_job *bsg_job)
|
||||
|
||||
bsg_job->reply_len = sizeof(struct fc_bsg_reply);
|
||||
bsg_reply->result = DID_OK << 16;
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
return 0;
|
||||
}
|
||||
@@ -2180,7 +2180,7 @@ qla27xx_get_flash_upd_cap(struct bsg_job *bsg_job)
|
||||
|
||||
bsg_job->reply_len = sizeof(struct fc_bsg_reply);
|
||||
bsg_reply->result = DID_OK << 16;
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
return 0;
|
||||
}
|
||||
@@ -2226,7 +2226,7 @@ qla27xx_set_flash_upd_cap(struct bsg_job *bsg_job)
|
||||
|
||||
bsg_job->reply_len = sizeof(struct fc_bsg_reply);
|
||||
bsg_reply->result = DID_OK << 16;
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
return 0;
|
||||
}
|
||||
@@ -2285,7 +2285,7 @@ done:
|
||||
|
||||
bsg_job->reply_len = sizeof(struct fc_bsg_reply);
|
||||
bsg_reply->result = DID_OK << 16;
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
return 0;
|
||||
}
|
||||
@@ -2342,7 +2342,7 @@ qla2x00_get_priv_stats(struct bsg_job *bsg_job)
|
||||
|
||||
bsg_job->reply_len = sizeof(*bsg_reply);
|
||||
bsg_reply->result = DID_OK << 16;
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
|
||||
dma_free_coherent(&ha->pdev->dev, sizeof(*stats),
|
||||
@@ -2386,7 +2386,7 @@ qla2x00_do_dport_diagnostics(struct bsg_job *bsg_job)
|
||||
|
||||
bsg_job->reply_len = sizeof(*bsg_reply);
|
||||
bsg_reply->result = DID_OK << 16;
|
||||
fc_bsg_jobdone(bsg_job, bsg_reply->result,
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
|
||||
kfree(dd);
|
||||
|
||||
Reference in New Issue
Block a user