diff mbox series

[2/2] um: Delete never executed timer

Message ID 20200220084014.238768-3-leon@kernel.org
State Accepted
Headers show
Series Remove dead code and driver version | expand

Commit Message

Leon Romanovsky Feb. 20, 2020, 8:40 a.m. UTC 
From: Leon Romanovsky <leonro@mellanox.com>


The "#ifdef undef" construction effectively disabled the timer.
It causes to the fact that this timer did nothing, so delete it.

Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
 arch/um/drivers/net_kern.c | 12 ------------
 1 file changed, 12 deletions(-)

--
2.24.1

Comments

Anton Ivanov Feb. 20, 2020, 7:36 p.m. UTC | #1 
On 20/02/2020 08:40, Leon Romanovsky wrote:
> From: Leon Romanovsky <leonro@mellanox.com>
> 
> 
> The "#ifdef undef" construction effectively disabled the timer.
> It causes to the fact that this timer did nothing, so delete it.
> 
> Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> ---
>   arch/um/drivers/net_kern.c | 12 ------------
>   1 file changed, 12 deletions(-)
> 
> diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
> index af07733c2dc8..1802cf4ef5a5 100644
> --- a/arch/um/drivers/net_kern.c
> +++ b/arch/um/drivers/net_kern.c
> @@ -274,17 +274,6 @@ static const struct ethtool_ops uml_net_ethtool_ops = {
>   	.get_ts_info	= ethtool_op_get_ts_info,
>   };
> 
> -static void uml_net_user_timer_expire(struct timer_list *t)
> -{
> -#ifdef undef
> -	struct uml_net_private *lp = from_timer(lp, t, tl);
> -	struct connection *conn = &lp->user;
> -
> -	dprintk(KERN_INFO "uml_net_user_timer_expire [%p]\n", conn);
> -	do_connect(conn);
> -#endif
> -}
> -
>   void uml_net_setup_etheraddr(struct net_device *dev, char *str)
>   {
>   	unsigned char *addr = dev->dev_addr;
> @@ -455,7 +444,6 @@ static void eth_configure(int n, void *init, char *mac,
>   		  .add_address 		= transport->user->add_address,
>   		  .delete_address  	= transport->user->delete_address });
> 
> -	timer_setup(&lp->tl, uml_net_user_timer_expire, 0);
>   	spin_lock_init(&lp->lock);
>   	memcpy(lp->mac, dev->dev_addr, sizeof(lp->mac));
> 
> --
> 2.24.1
> 
> 

Acked-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
diff mbox series

Patch

diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index af07733c2dc8..1802cf4ef5a5 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -274,17 +274,6 @@  static const struct ethtool_ops uml_net_ethtool_ops = {
 	.get_ts_info	= ethtool_op_get_ts_info,
 };

-static void uml_net_user_timer_expire(struct timer_list *t)
-{
-#ifdef undef
-	struct uml_net_private *lp = from_timer(lp, t, tl);
-	struct connection *conn = &lp->user;
-
-	dprintk(KERN_INFO "uml_net_user_timer_expire [%p]\n", conn);
-	do_connect(conn);
-#endif
-}
-
 void uml_net_setup_etheraddr(struct net_device *dev, char *str)
 {
 	unsigned char *addr = dev->dev_addr;
@@ -455,7 +444,6 @@  static void eth_configure(int n, void *init, char *mac,
 		  .add_address 		= transport->user->add_address,
 		  .delete_address  	= transport->user->delete_address });

-	timer_setup(&lp->tl, uml_net_user_timer_expire, 0);
 	spin_lock_init(&lp->lock);
 	memcpy(lp->mac, dev->dev_addr, sizeof(lp->mac));