pppoe: remove unused return value from two methods.

ramirosen · davem330 · commit 3b12bb60437e · 2012-05-17T15:34:34.000-04:00
The patch removes unused return value from __delete_item() and
delete_item() methods in drivers/net/ppp/pppoe.c.

Signed-off-by: Rami Rosen &lt;ramirose@gmail.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c
@@ -201,7 +201,7 @@ static int __set_item(struct pppoe_net *pn, struct pppox_sock *po)
 	return 0;
 }
 
-static struct pppox_sock *__delete_item(struct pppoe_net *pn, __be16 sid,
+static void __delete_item(struct pppoe_net *pn, __be16 sid,
 					char *addr, int ifindex)
 {
 	int hash = hash_item(sid, addr);
@@ -220,8 +220,6 @@ static struct pppox_sock *__delete_item(struct pppoe_net *pn, __be16 sid,
 		src = &ret->next;
 		ret = ret->next;
 	}
-
-	return ret;
 }
 
 /**********************************************************************
@@ -264,16 +262,12 @@ static inline struct pppox_sock *get_item_by_addr(struct net *net,
 	return pppox_sock;
 }
 
-static inline struct pppox_sock *delete_item(struct pppoe_net *pn, __be16 sid,
+static inline void delete_item(struct pppoe_net *pn, __be16 sid,
 					char *addr, int ifindex)
 {
-	struct pppox_sock *ret;
-
 	write_lock_bh(&pn->hash_lock);
-	ret = __delete_item(pn, sid, addr, ifindex);
+	__delete_item(pn, sid, addr, ifindex);
 	write_unlock_bh(&pn->hash_lock);
-
-	return ret;
 }
 
 /***************************************************************************

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ static int __set_item(struct pppoe_net pn, struct pppox_sock po)`
`201`	`201`	`return 0;`
`202`	`202`	`}`
`203`	`203`
`204`		`-static struct pppox_sock __delete_item(struct pppoe_net pn, __be16 sid,`
	`204`	`+static void __delete_item(struct pppoe_net *pn, __be16 sid,`
`205`	`205`	`char *addr, int ifindex)`
`206`	`206`	`{`
`207`	`207`	`int hash = hash_item(sid, addr);`
`@@ -220,8 +220,6 @@ static struct pppox_sock __delete_item(struct pppoe_net pn, __be16 sid,`
`220`	`220`	`src = &ret->next;`
`221`	`221`	`ret = ret->next;`
`222`	`222`	`}`
`223`		`-`
`224`		`- return ret;`
`225`	`223`	`}`
`226`	`224`
`227`	`225`	`/**********************************************************************`
`@@ -264,16 +262,12 @@ static inline struct pppox_sock get_item_by_addr(struct net net,`
`264`	`262`	`return pppox_sock;`
`265`	`263`	`}`
`266`	`264`
`267`		`-static inline struct pppox_sock delete_item(struct pppoe_net pn, __be16 sid,`
	`265`	`+static inline void delete_item(struct pppoe_net *pn, __be16 sid,`
`268`	`266`	`char *addr, int ifindex)`
`269`	`267`	`{`
`270`		`- struct pppox_sock *ret;`
`271`		`-`
`272`	`268`	`write_lock_bh(&pn->hash_lock);`
`273`		`- ret = __delete_item(pn, sid, addr, ifindex);`
	`269`	`+ __delete_item(pn, sid, addr, ifindex);`
`274`	`270`	`write_unlock_bh(&pn->hash_lock);`
`275`		`-`
`276`		`- return ret;`
`277`	`271`	`}`
`278`	`272`
`279`	`273`	`/***************************************************************************`