From 494f90c809be43d431322ae4861738a3c3ce14e3 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Wed, 24 Nov 2010 19:34:25 +0000
Subject: [PATCH] --- yaml --- r: 228201 b: refs/heads/master c:
 4c8e2a1f3d5e6b63ebfd26f324a2b24194af37fa h: refs/heads/master i:   228199:
 2e07e303fa0794310e7892d502006eedbc0a04b8 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/staging/sep/sep_driver.c | 42 --------------------------
 2 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/[refs] b/[refs]
index cc25264997e6..c0d5ba4890fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d80e4e2da31be71b8c1a5def986e10831d2aada
+refs/heads/master: 4c8e2a1f3d5e6b63ebfd26f324a2b24194af37fa
diff --git a/trunk/drivers/staging/sep/sep_driver.c b/trunk/drivers/staging/sep/sep_driver.c
index 38b2db49c403..c98cb9b481bd 100644
--- a/trunk/drivers/staging/sep/sep_driver.c
+++ b/trunk/drivers/staging/sep/sep_driver.c
@@ -933,38 +933,6 @@ static unsigned long sep_set_time(struct sep_device *sep)
 	return time.tv_sec;
 }
 
-/**
- *	sep_init_caller_id - initializes the caller id functionality
- *	@sep: pointer to struct sep_device
- */
-static int sep_init_caller_id(struct sep_device *sep)
-{
-	int counter;
-
-	dev_dbg(&sep->pdev->dev,
-		"sep_init_caller_id start\n");
-
-	/**
-	 * init caller id table
-	 * note that locking is not needed here as this function is
-	 * called prior to registering the device file
-	 */
-	for (counter = 0; counter < SEP_CALLER_ID_TABLE_NUM_ENTRIES; counter++)
-		sep->caller_id_table[counter].pid = 0;
-
-
-	/* init access flag */
-	sep->singleton_access_flag = 0;
-
-	dev_dbg(&sep->pdev->dev,
-		"caller id table init finished\n");
-
-	dev_dbg(&sep->pdev->dev,
-		"sep_init_caller_id end\n");
-
-	return 0;
-}
-
 /**
  *	sep_set_caller_id_handler - inserts the data into the caller id table
  *      note that this function does fall under the ioctl lock
@@ -4056,16 +4024,6 @@ static int __init sep_init(void)
 	mutex_init(&sep->sep_mutex);
 	mutex_init(&sep->ioctl_mutex);
 
-	if (sep->mrst == 0) {
-		ret_val = sep_init_caller_id(sep);
-		if (ret_val) {
-			dev_warn(&sep->pdev->dev,
-				"cant init caller id\n");
-			goto end_function_unregister_pci;
-		}
-
-	}
-
 	/* new chip requires share area reconfigure */
 	if (sep->pdev->revision == 4) { /* only for new chip */
 		ret_val = sep_reconfig_shared_area(sep);