Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3192690 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

net: Remove casts to same type 



Adding casts of objects to the same type is unnecessary
and confusing for a human reader.

For example, this cast:

	int y;
	int *p = (int *)&y;

I used the coccinelle script below to find and remove these
unnecessary casts.  I manually removed the conversions this
script produces of casts with __force and __user.

@@
type T;
T *p;
@@

-	(T *)p
+	p

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 29a6b6c0

net/9p/client.c

+1 −1
Original line number Diff line number Diff line
@@ -1548,7 +1548,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset, 
			kernel_buf = 1;

			indata = data;

		} else

			indata = (char *)udata;

			indata = udata;

		/*

		 * response header len is 11

		 * PDU Header(7) + IO Size (4)

net/atm/lec.c

+1 −1
Original line number Diff line number Diff line
@@ -1604,7 +1604,7 @@ static void lec_arp_expire_vcc(unsigned long data) 
{

	unsigned long flags;

	struct lec_arp_table *to_remove = (struct lec_arp_table *)data;

	struct lec_priv *priv = (struct lec_priv *)to_remove->priv;

	struct lec_priv *priv = to_remove->priv;



	del_timer(&to_remove->timer);

net/decnet/dn_nsp_out.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static __le16 *dn_mk_ack_header(struct sock *sk, struct sk_buff *skb, unsigned c 
	/* Set "cross subchannel" bit in ackcrs */

	ackcrs |= 0x2000;



	ptr = (__le16 *)dn_mk_common_header(scp, skb, msgflag, hlen);

	ptr = dn_mk_common_header(scp, skb, msgflag, hlen);



	*ptr++ = cpu_to_le16(acknum);

	*ptr++ = cpu_to_le16(ackcrs);

net/ipv4/af_inet.c

+1 −1
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ int inet_dgram_connect(struct socket *sock, struct sockaddr *uaddr, 


	if (!inet_sk(sk)->inet_num && inet_autobind(sk))

		return -EAGAIN;

	return sk->sk_prot->connect(sk, (struct sockaddr *)uaddr, addr_len);

	return sk->sk_prot->connect(sk, uaddr, addr_len);

}

EXPORT_SYMBOL(inet_dgram_connect);

net/ipv4/fib_trie.c

+6 −7
Original line number Diff line number Diff line
@@ -1007,9 +1007,9 @@ static void trie_rebalance(struct trie *t, struct tnode *tn) 
	while (tn != NULL && (tp = node_parent((struct rt_trie_node *)tn)) != NULL) {

		cindex = tkey_extract_bits(key, tp->pos, tp->bits);

		wasfull = tnode_full(tp, tnode_get_child(tp, cindex));

		tn = (struct tnode *) resize(t, (struct tnode *)tn);

		tn = (struct tnode *)resize(t, tn);



		tnode_put_child_reorg((struct tnode *)tp, cindex,

		tnode_put_child_reorg(tp, cindex,

				      (struct rt_trie_node *)tn, wasfull);



		tp = node_parent((struct rt_trie_node *) tn);
@@ -1024,7 +1024,7 @@ static void trie_rebalance(struct trie *t, struct tnode *tn) 


	/* Handle last (top) tnode */

	if (IS_TNODE(tn))

		tn = (struct tnode *)resize(t, (struct tnode *)tn);

		tn = (struct tnode *)resize(t, tn);



	rcu_assign_pointer(t->trie, (struct rt_trie_node *)tn);

	tnode_free_flush();
@@ -1125,7 +1125,7 @@ static struct list_head *fib_insert_node(struct trie *t, u32 key, int plen) 
		node_set_parent((struct rt_trie_node *)l, tp);



		cindex = tkey_extract_bits(key, tp->pos, tp->bits);

		put_child(t, (struct tnode *)tp, cindex, (struct rt_trie_node *)l);

		put_child(t, tp, cindex, (struct rt_trie_node *)l);

	} else {

		/* Case 3: n is a LEAF or a TNODE and the key doesn't match. */

		/*
@@ -1160,8 +1160,7 @@ static struct list_head *fib_insert_node(struct trie *t, u32 key, int plen) 


		if (tp) {

			cindex = tkey_extract_bits(key, tp->pos, tp->bits);

			put_child(t, (struct tnode *)tp, cindex,

				  (struct rt_trie_node *)tn);

			put_child(t, tp, cindex, (struct rt_trie_node *)tn);

		} else {

			rcu_assign_pointer(t->trie, (struct rt_trie_node *)tn);

			tp = tn;
@@ -1620,7 +1619,7 @@ static void trie_leaf_remove(struct trie *t, struct leaf *l) 


	if (tp) {

		t_key cindex = tkey_extract_bits(l->key, tp->pos, tp->bits);

		put_child(t, (struct tnode *)tp, cindex, NULL);

		put_child(t, tp, cindex, NULL);

		trie_rebalance(t, tp);

	} else

		RCU_INIT_POINTER(t->trie, NULL);