diff --git a/scst/src/scst_main.c b/scst/src/scst_main.c
index 1440bc4b1..30ce3954e 100644
--- a/scst/src/scst_main.c
+++ b/scst/src/scst_main.c
@@ -1270,10 +1270,7 @@ static struct scst_device *__scst_lookup_device(struct scsi_device *scsidp)
 	return NULL;
 }
 
-static void scst_unregister_device(struct scsi_device *scsidp,
-				   void (*on_free)(struct scst_device *dev,
-						   void *arg),
-				   void *arg)
+static void scst_unregister_device(struct scsi_device *scsidp)
 {
 	struct scst_device *dev;
 	struct scst_acg_dev *acg_dev, *aa;
@@ -1331,9 +1328,6 @@ static void scst_unregister_device(struct scsi_device *scsidp,
 		   scsidp->host->host_no, scsidp->channel, scsidp->id,
 		   (u64)scsidp->lun, scsidp->type);
 
-	if (on_free)
-		on_free(dev, arg);
-
 	scst_free_device(dev);
 
 out:
@@ -2420,7 +2414,7 @@ static void scst_remove(struct device *cdev, struct class_interface *intf)
 
 	if ((scsidp->host->hostt->name == NULL) ||
 	    (strcmp(scsidp->host->hostt->name, SCST_LOCAL_NAME) != 0))
-		scst_unregister_device(scsidp, NULL, NULL);
+		scst_unregister_device(scsidp);
 
 	TRACE_EXIT();
 	return;