[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20101124193419.16425.37036.stgit@bob.linux.org.uk>
Date: Wed, 24 Nov 2010 19:34:25 +0000
From: Alan Cox <alan@...rguk.ukuu.org.uk>
To: greg@...ah.com, mark.a.allyn@...el.com,
linux-kernel@...r.kernel.org
Subject: [PATCH 05/12] sep: clean up caller_id function
From: Alan Cox <alan@...ux.intel.com>
This is called on a kmalloc/memset object. Remove everything that isn't a
set to zero
Oh look 8)
Signed-off-by: Alan Cox <alan@...ux.intel.com>
---
drivers/staging/sep/sep_driver.c | 42 --------------------------------------
1 files changed, 0 insertions(+), 42 deletions(-)
diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c
index 38b2db4..c98cb9b 100644
--- a/drivers/staging/sep/sep_driver.c
+++ b/drivers/staging/sep/sep_driver.c
@@ -934,38 +934,6 @@ static unsigned long sep_set_time(struct sep_device *sep)
}
/**
- * 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
* @sep: sep device
@@ -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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists