aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2011-05-14 17:14:52 -0400
committerSven Eckelmann <sven@narfation.org>2011-05-30 01:39:32 -0400
commit5f718c20076f4b47c3dc0f1277aef9966928089c (patch)
tree98c71b56526d9a8ab3edd037db1fa5597e5f7e64
parent37a4065ec79dcf172c44cb2741c1b9983ecfc492 (diff)
batman-adv: Remove explicit casts cast from void* for store
It is not necessary to cast a void* to the pointer type when we just store it and don't want to do pointer arithmetic before the actual assignment. Signed-off-by: Sven Eckelmann <sven@narfation.org>
-rw-r--r--net/batman-adv/bitarray.c2
-rw-r--r--net/batman-adv/hard-interface.c2
-rw-r--r--net/batman-adv/translation-table.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c
index 767e2379b1aa..700ee4f7a945 100644
--- a/net/batman-adv/bitarray.c
+++ b/net/batman-adv/bitarray.c
@@ -130,7 +130,7 @@ static void bit_reset_window(unsigned long *seq_bits)
130char bit_get_packet(void *priv, unsigned long *seq_bits, 130char bit_get_packet(void *priv, unsigned long *seq_bits,
131 int32_t seq_num_diff, int8_t set_mark) 131 int32_t seq_num_diff, int8_t set_mark)
132{ 132{
133 struct bat_priv *bat_priv = (struct bat_priv *)priv; 133 struct bat_priv *bat_priv = priv;
134 134
135 /* sequence number is slightly older. We already got a sequence number 135 /* sequence number is slightly older. We already got a sequence number
136 * higher than this one, so we just mark it. */ 136 * higher than this one, so we just mark it. */
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index 915e12b820b9..e626e75a7e65 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -523,7 +523,7 @@ void hardif_remove_interfaces(void)
523static int hard_if_event(struct notifier_block *this, 523static int hard_if_event(struct notifier_block *this,
524 unsigned long event, void *ptr) 524 unsigned long event, void *ptr)
525{ 525{
526 struct net_device *net_dev = (struct net_device *)ptr; 526 struct net_device *net_dev = ptr;
527 struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev); 527 struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev);
528 struct hard_iface *primary_if = NULL; 528 struct hard_iface *primary_if = NULL;
529 struct bat_priv *bat_priv; 529 struct bat_priv *bat_priv;
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index be7b5cc71d28..802eacef05b8 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -313,7 +313,7 @@ out:
313 313
314static void _tt_local_del(struct hlist_node *node, void *arg) 314static void _tt_local_del(struct hlist_node *node, void *arg)
315{ 315{
316 struct bat_priv *bat_priv = (struct bat_priv *)arg; 316 struct bat_priv *bat_priv = arg;
317 void *data = container_of(node, struct tt_local_entry, hash_entry); 317 void *data = container_of(node, struct tt_local_entry, hash_entry);
318 318
319 kfree(data); 319 kfree(data);