fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / net / irda / irqueue.c

diff --git a/net/irda/irqueue.c b/net/irda/irqueue.c
index ca948a0..1d26cd3 100644 (file)
--- a/net/irda/irqueue.c
+++ b/net/irda/irqueue.c
@@ -356,14 +356,13 @@ hashbin_t *hashbin_new(int type)
        /*
         * Allocate new hashbin
         */
-       hashbin = kmalloc( sizeof(hashbin_t), GFP_ATOMIC);
+       hashbin = kzalloc(sizeof(*hashbin), GFP_ATOMIC);
        if (!hashbin)
                return NULL;
 
        /*
         * Initialize structure
         */
-       memset(hashbin, 0, sizeof(hashbin_t));
        hashbin->hb_type = type;
        hashbin->magic = HB_MAGIC;
        //hashbin->hb_current = NULL;
@@ -391,8 +390,8 @@ int hashbin_delete( hashbin_t* hashbin, FREE_FUNC free_func)
        unsigned long flags = 0;
        int i;
 
-       ASSERT(hashbin != NULL, return -1;);
-       ASSERT(hashbin->magic == HB_MAGIC, return -1;);
+       IRDA_ASSERT(hashbin != NULL, return -1;);
+       IRDA_ASSERT(hashbin->magic == HB_MAGIC, return -1;);
        
        /* Synchronize */
        if ( hashbin->hb_type & HB_LOCK ) {
@@ -447,8 +446,8 @@ void hashbin_insert(hashbin_t* hashbin, irda_queue_t* entry, long hashv,
 
        IRDA_DEBUG( 4, "%s()\n", __FUNCTION__);
 
-       ASSERT( hashbin != NULL, return;);
-       ASSERT( hashbin->magic == HB_MAGIC, return;);
+       IRDA_ASSERT( hashbin != NULL, return;);
+       IRDA_ASSERT( hashbin->magic == HB_MAGIC, return;);
 
        /*
         * Locate hashbin
@@ -560,8 +559,8 @@ void* hashbin_remove( hashbin_t* hashbin, long hashv, const char* name)
 
        IRDA_DEBUG( 4, "%s()\n", __FUNCTION__);
 
-       ASSERT( hashbin != NULL, return NULL;);
-       ASSERT( hashbin->magic == HB_MAGIC, return NULL;);
+       IRDA_ASSERT( hashbin != NULL, return NULL;);
+       IRDA_ASSERT( hashbin->magic == HB_MAGIC, return NULL;);
        
        /*
         * Locate hashbin
@@ -653,9 +652,9 @@ void* hashbin_remove_this( hashbin_t* hashbin, irda_queue_t* entry)
 
        IRDA_DEBUG( 4, "%s()\n", __FUNCTION__);
 
-       ASSERT( hashbin != NULL, return NULL;);
-       ASSERT( hashbin->magic == HB_MAGIC, return NULL;);
-       ASSERT( entry != NULL, return NULL;);
+       IRDA_ASSERT( hashbin != NULL, return NULL;);
+       IRDA_ASSERT( hashbin->magic == HB_MAGIC, return NULL;);
+       IRDA_ASSERT( entry != NULL, return NULL;);
        
        /* Synchronize */
        if ( hashbin->hb_type & HB_LOCK ) {
@@ -714,8 +713,8 @@ void* hashbin_find( hashbin_t* hashbin, long hashv, const char* name )
 
        IRDA_DEBUG( 4, "hashbin_find()\n");
 
-       ASSERT( hashbin != NULL, return NULL;);
-       ASSERT( hashbin->magic == HB_MAGIC, return NULL;);
+       IRDA_ASSERT( hashbin != NULL, return NULL;);
+       IRDA_ASSERT( hashbin->magic == HB_MAGIC, return NULL;);
 
        /*
         * Locate hashbin
@@ -822,7 +821,6 @@ void* hashbin_find_next( hashbin_t* hashbin, long hashv, const char* name,
 
        return entry;
 }
-EXPORT_SYMBOL(hashbin_find_next);
 
 /*
  * Function hashbin_get_first (hashbin)
@@ -836,8 +834,8 @@ irda_queue_t *hashbin_get_first( hashbin_t* hashbin)
        irda_queue_t *entry;
        int i;
 
-       ASSERT( hashbin != NULL, return NULL;);
-       ASSERT( hashbin->magic == HB_MAGIC, return NULL;);
+       IRDA_ASSERT( hashbin != NULL, return NULL;);
+       IRDA_ASSERT( hashbin->magic == HB_MAGIC, return NULL;);
 
        if ( hashbin == NULL)
                return NULL;
@@ -872,11 +870,11 @@ irda_queue_t *hashbin_get_next( hashbin_t *hashbin)
        int bin;
        int i;
 
-       ASSERT( hashbin != NULL, return NULL;);
-       ASSERT( hashbin->magic == HB_MAGIC, return NULL;);
+       IRDA_ASSERT( hashbin != NULL, return NULL;);
+       IRDA_ASSERT( hashbin->magic == HB_MAGIC, return NULL;);
 
        if ( hashbin->hb_current == NULL) {
-               ASSERT( hashbin->hb_current != NULL, return NULL;);
+               IRDA_ASSERT( hashbin->hb_current != NULL, return NULL;);
                return NULL;
        }       
        entry = hashbin->hb_current->q_next;