1 files changed, 11 insertions, 10 deletions

diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c
index d74e278ec8f..373b0cc6abd 100644
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@ -143,7 +143,7 @@ int iscsi_check_for_session_reinstatement(struct iscsi_conn *conn)
         list_for_each_entry_safe(se_sess, se_sess_tmp, &se_tpg->tpg_sess_list,
                         sess_list) {
 
-                sess_p = (struct iscsi_session *)se_sess->fabric_sess_ptr;
+                sess_p = se_sess->fabric_sess_ptr;
                 spin_lock(&sess_p->conn_lock);
                 if (atomic_read(&sess_p->session_fall_back_to_erl0) ||
                     atomic_read(&sess_p->session_logout) ||
@@ -151,9 +151,9 @@ int iscsi_check_for_session_reinstatement(struct iscsi_conn *conn)
                         spin_unlock(&sess_p->conn_lock);
                         continue;
                 }
-                if (!memcmp((void *)sess_p->isid, (void *)conn->sess->isid, 6) &&
-                   (!strcmp((void *)sess_p->sess_ops->InitiatorName,
-                            (void *)initiatorname_param->value) &&
+                if (!memcmp(sess_p->isid, conn->sess->isid, 6) &&
+                   (!strcmp(sess_p->sess_ops->InitiatorName,
+                            initiatorname_param->value) &&
                    (sess_p->sess_ops->SessionType == sessiontype))) {
                         atomic_set(&sess_p->session_reinstatement, 1);
                         spin_unlock(&sess_p->conn_lock);
@@ -229,7 +229,7 @@ static int iscsi_login_zero_tsih_s1(
 
         iscsi_login_set_conn_values(sess, conn, pdu->cid);
         sess->init_task_tag     = pdu->itt;
-        memcpy((void *)&sess->isid, (void *)pdu->isid, 6);
+        memcpy(&sess->isid, pdu->isid, 6);
         sess->exp_cmd_sn        = pdu->cmdsn;
         INIT_LIST_HEAD(&sess->sess_conn_list);
         INIT_LIST_HEAD(&sess->sess_ooo_cmdsn_list);
@@ -440,8 +440,7 @@ static int iscsi_login_non_zero_tsih_s2(
                     atomic_read(&sess_p->session_logout) ||
                    (sess_p->time2retain_timer_flags & ISCSI_TF_EXPIRED))
                         continue;
-                if (!memcmp((const void *)sess_p->isid,
-                     (const void *)pdu->isid, 6) &&
+                if (!memcmp(sess_p->isid, pdu->isid, 6) &&
                      (sess_p->tsih == pdu->tsih)) {
                         iscsit_inc_session_usage_count(sess_p);
                         iscsit_stop_time2retain_timer(sess_p);
@@ -654,7 +653,7 @@ static int iscsi_post_login_handler(
 
         spin_lock_bh(&se_tpg->session_lock);
         __transport_register_session(&sess->tpg->tpg_se_tpg,
-                        se_sess->se_node_acl, se_sess, (void *)sess);
+                        se_sess->se_node_acl, se_sess, sess);
         pr_debug("Moving to TARG_SESS_STATE_LOGGED_IN.\n");
         sess->session_state = TARG_SESS_STATE_LOGGED_IN;
 
@@ -811,7 +810,7 @@ int iscsi_target_setup_login_socket(
          * Setup the np->np_sockaddr from the passed sockaddr setup
          * in iscsi_target_configfs.c code..
          */
-        memcpy((void *)&np->np_sockaddr, (void *)sockaddr,
+        memcpy(&np->np_sockaddr, sockaddr,
                         sizeof(struct __kernel_sockaddr_storage));
 
         if (sockaddr->ss_family == AF_INET6)
@@ -821,6 +820,7 @@ int iscsi_target_setup_login_socket(
         /*
          * Set SO_REUSEADDR, and disable Nagel Algorithm with TCP_NODELAY.
          */
+        /* FIXME: Someone please explain why this is endian-safe */
         opt = 1;
         if (np->np_network_transport == ISCSI_TCP) {
                 ret = kernel_setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
@@ -832,6 +832,7 @@ int iscsi_target_setup_login_socket(
                 }
         }
 
+        /* FIXME: Someone please explain why this is endian-safe */
         ret = kernel_setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
                         (char *)&opt, sizeof(opt));
         if (ret < 0) {
@@ -1206,7 +1207,7 @@ out:
 
 int iscsi_target_login_thread(void *arg)
 {
-        struct iscsi_np *np = (struct iscsi_np *)arg;
+        struct iscsi_np *np = arg;
         int ret;
 
         allow_signal(SIGINT);