net: Remove casts of void *

Unnecessary casts of void * clutter the code.

These are the remainder casts after several specific
patches to remove netdev_priv and dev_priv.

Done via coccinelle script:

$ cat cast_void_pointer.cocci
@@
type T;
T *pt;
void *pv;
@@

- pt = (T *)pv;
+ pt = pv;

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Paul Moore <paul.moore@hp.com>
Signed-off-by: David S. Miller <davem@conan.davemloft.net>

4 files changed, 16 insertions, 16 deletions

diff --git a/net/irda/irlan/irlan_client.c b/net/irda/irlan/irlan_client.c
index 7ed3af957935..ba1a3fc39b5c 100644
--- a/net/irda/irlan/irlan_client.c
+++ b/net/irda/irlan/irlan_client.c
@@ -198,7 +198,7 @@ static int irlan_client_ctrl_data_indication(void *instance, void *sap,
 
         IRDA_DEBUG(2, "%s()\n", __func__ );
 
-        self = (struct irlan_cb *) instance;
+        self = instance;
 
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
@@ -226,8 +226,8 @@ static void irlan_client_ctrl_disconnect_indication(void *instance, void *sap,
 
         IRDA_DEBUG(4, "%s(), reason=%d\n", __func__ , reason);
 
-        self = (struct irlan_cb *) instance;
-        tsap = (struct tsap_cb *) sap;
+        self = instance;
+        tsap = sap;
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -298,7 +298,7 @@ static void irlan_client_ctrl_connect_confirm(void *instance, void *sap,
 
         IRDA_DEBUG(4, "%s()\n", __func__ );
 
-        self = (struct irlan_cb *) instance;
+        self = instance;
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -542,7 +542,7 @@ void irlan_client_get_value_confirm(int result, __u16 obj_id,
 
         IRDA_ASSERT(priv != NULL, return;);
 
-        self = (struct irlan_cb *) priv;
+        self = priv;
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
 
         /* We probably don't need to make any more queries */
diff --git a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c
index 6130f9d9dbe1..779117636270 100644
--- a/net/irda/irlan/irlan_common.c
+++ b/net/irda/irlan/irlan_common.c
@@ -317,8 +317,8 @@ static void irlan_connect_indication(void *instance, void *sap,
 
         IRDA_DEBUG(2, "%s()\n", __func__ );
 
-        self = (struct irlan_cb *) instance;
-        tsap = (struct tsap_cb *) sap;
+        self = instance;
+        tsap = sap;
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -361,7 +361,7 @@ static void irlan_connect_confirm(void *instance, void *sap,
 {
         struct irlan_cb *self;
 
-        self = (struct irlan_cb *) instance;
+        self = instance;
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -406,8 +406,8 @@ static void irlan_disconnect_indication(void *instance,
 
         IRDA_DEBUG(0, "%s(), reason=%d\n", __func__ , reason);
 
-        self = (struct irlan_cb *) instance;
-        tsap = (struct tsap_cb *) sap;
+        self = instance;
+        tsap = sap;
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c
index 8ee1ff6c742f..e8d5f4405d68 100644
--- a/net/irda/irlan/irlan_eth.c
+++ b/net/irda/irlan/irlan_eth.c
@@ -272,7 +272,7 @@ void irlan_eth_flow_indication(void *instance, void *sap, LOCAL_FLOW flow)
         struct irlan_cb *self;
         struct net_device *dev;
 
-        self = (struct irlan_cb *) instance;
+        self = instance;
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
diff --git a/net/irda/irlan/irlan_provider.c b/net/irda/irlan/irlan_provider.c
index b8af74ab8b68..8b61cf0d8a69 100644
--- a/net/irda/irlan/irlan_provider.c
+++ b/net/irda/irlan/irlan_provider.c
@@ -73,7 +73,7 @@ static int irlan_provider_data_indication(void *instance, void *sap,
 
         IRDA_DEBUG(4, "%s()\n", __func__ );
 
-        self = (struct irlan_cb *) instance;
+        self = instance;
 
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
@@ -131,8 +131,8 @@ static void irlan_provider_connect_indication(void *instance, void *sap,
 
         IRDA_DEBUG(0, "%s()\n", __func__ );
 
-        self = (struct irlan_cb *) instance;
-        tsap = (struct tsap_cb *) sap;
+        self = instance;
+        tsap = sap;
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -182,8 +182,8 @@ static void irlan_provider_disconnect_indication(void *instance, void *sap,
 
         IRDA_DEBUG(4, "%s(), reason=%d\n", __func__ , reason);
 
-        self = (struct irlan_cb *) instance;
-        tsap = (struct tsap_cb *) sap;
+        self = instance;
+        tsap = sap;
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);