Merge branch 'for-3.6/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / net / irda / iriap.c

diff --git a/net/irda/iriap.c b/net/irda/iriap.c
index f876eed7d4aad3099869acad4670e102e1bf368e..e71e85ba2bf1c180b2038d62021283ddf7982b07 100644 (file)
--- a/net/irda/iriap.c
+++ b/net/irda/iriap.c
@@ -305,7 +305,7 @@ static void iriap_disconnect_indication(void *instance, void *sap,
 
        IRDA_DEBUG(4, "%s(), reason=%s\n", __func__, irlmp_reasons[reason]);
 
-       self = (struct iriap_cb *) instance;
+       self = instance;
 
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IAS_MAGIC, return;);
@@ -759,7 +759,7 @@ static void iriap_connect_confirm(void *instance, void *sap,
 {
        struct iriap_cb *self;
 
-       self = (struct iriap_cb *) instance;
+       self = instance;
 
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IAS_MAGIC, return;);
@@ -791,7 +791,7 @@ static void iriap_connect_indication(void *instance, void *sap,
 
        IRDA_DEBUG(1, "%s()\n", __func__);
 
-       self = (struct iriap_cb *) instance;
+       self = instance;
 
        IRDA_ASSERT(skb != NULL, return;);
        IRDA_ASSERT(self != NULL, goto out;);
@@ -839,7 +839,7 @@ static int iriap_data_indication(void *instance, void *sap,
 
        IRDA_DEBUG(3, "%s()\n", __func__);
 
-       self = (struct iriap_cb *) instance;
+       self = instance;
 
        IRDA_ASSERT(skb != NULL, return 0;);
        IRDA_ASSERT(self != NULL, goto out;);