Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[sfrench/cifs-2.6.git] / drivers / scsi / bnx2i / bnx2i_hwi.c

diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c
index 61a93994d5ed210b8fca4905871b95a6c98b4329..e0640e0f259f9643f88fa5821e175b1982e66445 100644 (file)
--- a/drivers/scsi/bnx2i/bnx2i_hwi.c
+++ b/drivers/scsi/bnx2i/bnx2i_hwi.c
@@ -332,12 +332,10 @@ static void bnx2i_ring_dbell_update_sq_params(struct bnx2i_conn *bnx2i_conn,
 int bnx2i_send_iscsi_login(struct bnx2i_conn *bnx2i_conn,
                           struct iscsi_task *task)
 {
-       struct bnx2i_cmd *bnx2i_cmd;
        struct bnx2i_login_request *login_wqe;
        struct iscsi_login_req *login_hdr;
        u32 dword;
 
-       bnx2i_cmd = (struct bnx2i_cmd *)task->dd_data;
        login_hdr = (struct iscsi_login_req *)task->hdr;
        login_wqe = (struct bnx2i_login_request *)
                                                bnx2i_conn->ep->qp.sq_prod_qe;
@@ -391,12 +389,10 @@ int bnx2i_send_iscsi_tmf(struct bnx2i_conn *bnx2i_conn,
        struct iscsi_tm *tmfabort_hdr;
        struct scsi_cmnd *ref_sc;
        struct iscsi_task *ctask;
-       struct bnx2i_cmd *bnx2i_cmd;
        struct bnx2i_tmf_request *tmfabort_wqe;
        u32 dword;
        u32 scsi_lun[2];
 
-       bnx2i_cmd = (struct bnx2i_cmd *)mtask->dd_data;
        tmfabort_hdr = (struct iscsi_tm *)mtask->hdr;
        tmfabort_wqe = (struct bnx2i_tmf_request *)
                                                bnx2i_conn->ep->qp.sq_prod_qe;
@@ -463,12 +459,10 @@ int bnx2i_send_iscsi_tmf(struct bnx2i_conn *bnx2i_conn,
 int bnx2i_send_iscsi_text(struct bnx2i_conn *bnx2i_conn,
                          struct iscsi_task *mtask)
 {
-       struct bnx2i_cmd *bnx2i_cmd;
        struct bnx2i_text_request *text_wqe;
        struct iscsi_text *text_hdr;
        u32 dword;
 
-       bnx2i_cmd = (struct bnx2i_cmd *)mtask->dd_data;
        text_hdr = (struct iscsi_text *)mtask->hdr;
        text_wqe = (struct bnx2i_text_request *) bnx2i_conn->ep->qp.sq_prod_qe;
 
@@ -541,11 +535,9 @@ int bnx2i_send_iscsi_nopout(struct bnx2i_conn *bnx2i_conn,
                            char *datap, int data_len, int unsol)
 {
        struct bnx2i_endpoint *ep = bnx2i_conn->ep;
-       struct bnx2i_cmd *bnx2i_cmd;
        struct bnx2i_nop_out_request *nopout_wqe;
        struct iscsi_nopout *nopout_hdr;
 
-       bnx2i_cmd = (struct bnx2i_cmd *)task->dd_data;
        nopout_hdr = (struct iscsi_nopout *)task->hdr;
        nopout_wqe = (struct bnx2i_nop_out_request *)ep->qp.sq_prod_qe;
 
@@ -602,11 +594,9 @@ int bnx2i_send_iscsi_nopout(struct bnx2i_conn *bnx2i_conn,
 int bnx2i_send_iscsi_logout(struct bnx2i_conn *bnx2i_conn,
                            struct iscsi_task *task)
 {
-       struct bnx2i_cmd *bnx2i_cmd;
        struct bnx2i_logout_request *logout_wqe;
        struct iscsi_logout *logout_hdr;
 
-       bnx2i_cmd = (struct bnx2i_cmd *)task->dd_data;
        logout_hdr = (struct iscsi_logout *)task->hdr;
 
        logout_wqe = (struct bnx2i_logout_request *)