Staging: sep: clean up caller_id function
authorAlan Cox <alan@linux.intel.com>
Wed, 24 Nov 2010 19:34:25 +0000 (19:34 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 29 Nov 2010 19:17:27 +0000 (11:17 -0800)
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@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/sep/sep_driver.c

index 38b2db49c4030959221a5004234aa2bb78ebff80..c98cb9b481bdaa53acffbebf4e8c4c272339b9d2 100644 (file)
@@ -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);