Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[pandora-kernel.git] / net / irda / irttp.c

diff --git a/net/irda/irttp.c b/net/irda/irttp.c
index 9d9af46..285ccd6 100644 (file)
--- a/net/irda/irttp.c
+++ b/net/irda/irttp.c
@@ -350,7 +350,7 @@ static int irttp_param_max_sdu_size(void *instance, irda_param_t *param,
 {
        struct tsap_cb *self;
 
-       self = (struct tsap_cb *) instance;
+       self = instance;
 
        IRDA_ASSERT(self != NULL, return -1;);
        IRDA_ASSERT(self->magic == TTP_TSAP_MAGIC, return -1;);
@@ -879,7 +879,7 @@ static int irttp_udata_indication(void *instance, void *sap,
 
        IRDA_DEBUG(4, "%s()\n", __func__);
 
-       self = (struct tsap_cb *) instance;
+       self = instance;
 
        IRDA_ASSERT(self != NULL, return -1;);
        IRDA_ASSERT(self->magic == TTP_TSAP_MAGIC, return -1;);
@@ -914,7 +914,7 @@ static int irttp_data_indication(void *instance, void *sap,
        unsigned long flags;
        int n;
 
-       self = (struct tsap_cb *) instance;
+       self = instance;
 
        n = skb->data[0] & 0x7f;     /* Extract the credits */
 
@@ -996,7 +996,7 @@ static void irttp_status_indication(void *instance,
 
        IRDA_DEBUG(4, "%s()\n", __func__);
 
-       self = (struct tsap_cb *) instance;
+       self = instance;
 
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == TTP_TSAP_MAGIC, return;);
@@ -1025,7 +1025,7 @@ static void irttp_flow_indication(void *instance, void *sap, LOCAL_FLOW flow)
 {
        struct tsap_cb *self;
 
-       self = (struct tsap_cb *) instance;
+       self = instance;
 
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == TTP_TSAP_MAGIC, return;);
@@ -1208,7 +1208,7 @@ static void irttp_connect_confirm(void *instance, void *sap,
 
        IRDA_DEBUG(4, "%s()\n", __func__);
 
-       self = (struct tsap_cb *) instance;
+       self = instance;
 
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == TTP_TSAP_MAGIC, return;);
@@ -1292,13 +1292,13 @@ static void irttp_connect_indication(void *instance, void *sap,
        __u8 plen;
        __u8 n;
 
-       self = (struct tsap_cb *) instance;
+       self = instance;
 
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == TTP_TSAP_MAGIC, return;);
        IRDA_ASSERT(skb != NULL, return;);
 
-       lsap = (struct lsap_cb *) sap;
+       lsap = sap;
 
        self->max_seg_size = max_seg_size - TTP_HEADER;
        self->max_header_size = max_header_size+TTP_HEADER;
@@ -1602,7 +1602,7 @@ static void irttp_disconnect_indication(void *instance, void *sap,
 
        IRDA_DEBUG(4, "%s()\n", __func__);
 
-       self = (struct tsap_cb *) instance;
+       self = instance;
 
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == TTP_TSAP_MAGIC, return;);