[Meego-kernel] [PATCH 2/9] sep: remove unneeded code

Mark Allyn mark.a.allyn at intel.com
Wed Dec 8 14:26:09 PST 2010


Code for connector process removed (it may be added later
when needed)

Signed-off-by: Mark Allyn <mark.a.allyn at intel.com>
---
 drivers/staging/sep/sep_driver.c |   25 ++-----------------------
 1 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c
index fac14f7..8f2cf51 100644
--- a/drivers/staging/sep/sep_driver.c
+++ b/drivers/staging/sep/sep_driver.c
@@ -53,12 +53,9 @@
 #include <asm/cacheflush.h>
 #include <linux/sched.h>
 #include <linux/delay.h>
+
 #include "../rar_register/rar_register.h"
 #include "../memrar/memrar.h"
-#include <linux/netlink.h>
-#include <linux/connector.h>
-#include <linux/cn_proc.h>
-
 #include "sep_driver_hw_defs.h"
 #include "sep_driver_config.h"
 #include "sep_driver_api.h"
@@ -941,23 +938,11 @@ static unsigned long sep_set_time(struct sep_device *sep)
  */
 static int sep_init_caller_id(struct sep_device *sep)
 {
-	/* return value */
-	int ret_val;
-
-	/* counter */
 	int counter;
 
-	struct cb_id caller_id;
-
 	dev_dbg(&sep->pdev->dev,
 		"sep_init_caller_id start\n");
 
-	ret_val = 0;
-
-	/* init cb_id struct */
-	caller_id.idx = CN_IDX_PROC;
-	caller_id.val = CN_VAL_PROC;
-
 	/**
 	 * init caller id table
 	 * note that locking is not needed here as this function is
@@ -973,16 +958,10 @@ static int sep_init_caller_id(struct sep_device *sep)
 	dev_dbg(&sep->pdev->dev,
 		"caller id table init finished\n");
 
-	/* register to netlink connector */
-
-	if (ret_val)
-		dev_warn(&sep->pdev->dev,
-			"cn_add_callback failed %x\n", ret_val);
-
 	dev_dbg(&sep->pdev->dev,
 		"sep_init_caller_id end\n");
 
-	return ret_val;
+	return 0;
 }
 
 /**
-- 
1.6.3.3



More information about the MeeGo-kernel mailing list