Merge remote-tracking branch 'wireless/master' into mac80211

[~andy/linux] / net / irda / irqueue.c

diff --git a/net/irda/irqueue.c b/net/irda/irqueue.c
index f06947c4fa82e59679314b07df2444906e99762f..7152624ed5f18035c2fd223bffd0682697cb86e4 100644 (file)
--- a/net/irda/irqueue.c
+++ b/net/irda/irqueue.c
@@ -523,7 +523,7 @@ void *hashbin_remove_first( hashbin_t *hashbin)
                 * Dequeue the entry...
                 */
                dequeue_general( (irda_queue_t**) &hashbin->hb_queue[ bin ],
-                                (irda_queue_t*) entry );
+                                entry);
                hashbin->hb_size--;
                entry->q_next = NULL;
                entry->q_prev = NULL;
@@ -615,7 +615,7 @@ void* hashbin_remove( hashbin_t* hashbin, long hashv, const char* name)
         */
        if ( found ) {
                dequeue_general( (irda_queue_t**) &hashbin->hb_queue[ bin ],
-                                (irda_queue_t*) entry );
+                                entry);
                hashbin->hb_size--;
 
                /*
@@ -685,7 +685,7 @@ void* hashbin_remove_this( hashbin_t* hashbin, irda_queue_t* entry)
         * Dequeue the entry...
         */
        dequeue_general( (irda_queue_t**) &hashbin->hb_queue[ bin ],
-                        (irda_queue_t*) entry );
+                        entry);
        hashbin->hb_size--;
        entry->q_next = NULL;
        entry->q_prev = NULL;