diff --git a/iscsi-scst/kernel/isert-scst/iser_datamover.c b/iscsi-scst/kernel/isert-scst/iser_datamover.c
index 2ea4ff5ba..eca083529 100644
--- a/iscsi-scst/kernel/isert-scst/iser_datamover.c
+++ b/iscsi-scst/kernel/isert-scst/iser_datamover.c
@@ -93,15 +93,13 @@ out:
 	return ret;
 }
 
-void *isert_portal_add(struct sockaddr *saddr, size_t addr_len)
+struct isert_portal *isert_portal_add(struct sockaddr *saddr, size_t addr_len)
 {
 	return isert_portal_start(saddr, addr_len);
 }
 
-int isert_portal_remove(void *portal_h)
+int isert_portal_remove(struct isert_portal *portal)
 {
-	struct isert_portal *portal = portal_h;
-
 	isert_portal_release(portal);
 	return 0;
 }
diff --git a/iscsi-scst/kernel/isert-scst/iser_datamover.h b/iscsi-scst/kernel/isert-scst/iser_datamover.h
index 8b749bdfa..ec1c8a378 100644
--- a/iscsi-scst/kernel/isert-scst/iser_datamover.h
+++ b/iscsi-scst/kernel/isert-scst/iser_datamover.h
@@ -42,8 +42,8 @@
 int isert_datamover_init(void);
 int isert_datamover_cleanup(void);
 
-void *isert_portal_add(struct sockaddr *sa, size_t addr_len);
-int isert_portal_remove(void *portal_h);
+struct isert_portal *isert_portal_add(struct sockaddr *sa, size_t addr_len);
+int isert_portal_remove(struct isert_portal *portal);
 
 struct iscsi_cmnd *isert_alloc_login_rsp_pdu(struct iscsi_conn *iscsi_conn);
 
diff --git a/iscsi-scst/kernel/isert-scst/isert.h b/iscsi-scst/kernel/isert-scst/isert.h
index 7a4554bce..dd541a1b2 100644
--- a/iscsi-scst/kernel/isert-scst/isert.h
+++ b/iscsi-scst/kernel/isert-scst/isert.h
@@ -63,6 +63,7 @@
 #include "iser_hdr.h"
 
 struct iscsi_conn;
+struct isert_portal;
 
 #define ISERT_NR_DEVS 128
 
@@ -76,7 +77,7 @@ struct isert_listener_dev {
 	struct list_head curr_conn_list;
 	struct isert_addr_info info;
 	atomic_t available;
-	void *portal_h[ISERT_MAX_PORTALS];
+	struct isert_portal *portal_h[ISERT_MAX_PORTALS];
 	int free_portal_idx;
 };
 
diff --git a/iscsi-scst/kernel/isert-scst/isert_login.c b/iscsi-scst/kernel/isert-scst/isert_login.c
index 6c9e2eac4..99ed1a909 100644
--- a/iscsi-scst/kernel/isert-scst/isert_login.c
+++ b/iscsi-scst/kernel/isert-scst/isert_login.c
@@ -395,7 +395,7 @@ static long isert_listen_ioctl(struct file *filp, unsigned int cmd,
 	struct isert_listener_dev *dev = filp->private_data;
 	int res = 0, rc;
 	void __user *ptr = (void __user *)arg;
-	void *portal;
+	struct isert_portal *portal;
 
 	TRACE_ENTRY();