firmware: arm_scpi: remove dvfs_get packed structure

[mirror_ubuntu-zesty-kernel.git] / drivers / scsi / libiscsi.c

diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 6bffd91b973a475d614500a077be0034dbf6786f..c051694bfcb0f42e1e983f409a581f1da5b344d2 100644 (file)
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -2127,7 +2127,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
        struct iscsi_conn *conn;
        struct iscsi_task *task;
        struct iscsi_tm *hdr;
-       int rc, age;
+       int age;
 
        cls_session = starget_to_session(scsi_target(sc->device));
        session = cls_session->dd_data;
@@ -2188,10 +2188,8 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
        hdr = &conn->tmhdr;
        iscsi_prep_abort_task_pdu(task, hdr);
 
-       if (iscsi_exec_task_mgmt_fn(conn, hdr, age, session->abort_timeout)) {
-               rc = FAILED;
+       if (iscsi_exec_task_mgmt_fn(conn, hdr, age, session->abort_timeout))
                goto failed;
-       }
 
        switch (conn->tmf_state) {
        case TMF_SUCCESS:
@@ -2423,7 +2421,7 @@ static void iscsi_prep_tgt_reset_pdu(struct scsi_cmnd *sc, struct iscsi_tm *hdr)
  *
  * This will attempt to send a warm target reset.
  */
-int iscsi_eh_target_reset(struct scsi_cmnd *sc)
+static int iscsi_eh_target_reset(struct scsi_cmnd *sc)
 {
        struct iscsi_cls_session *cls_session;
        struct iscsi_session *session;
@@ -2495,7 +2493,6 @@ done:
        mutex_unlock(&session->eh_mutex);
        return rc;
 }
-EXPORT_SYMBOL_GPL(iscsi_eh_target_reset);
 
 /**
  * iscsi_eh_recover_target - reset target and possibly the session