[PATCH 1/2] net: irda: au1k_ir: remove unused timer

[PATCH 1/2] net: irda: au1k_ir: remove unused timer

[Manuel Lauss]

remove the unused timer.  I suppose it was intended as a timeout
detector, but never properly implemented.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
---
 drivers/net/irda/au1k_ir.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c
index 44e4f386a5dc..bc2a63f5ca8c 100644
--- a/drivers/net/irda/au1k_ir.c
+++ b/drivers/net/irda/au1k_ir.c
@@ -169,8 +169,6 @@ struct au1k_private {
 	u32 speed;
 	u32 newspeed;
 
-	struct timer_list timer;
-
 	struct resource *ioarea;
 	struct au1k_irda_platform_data *platdata;
 	struct clk *irda_clk;
@@ -178,8 +176,6 @@ struct au1k_private {
 
 static int qos_mtt_bits = 0x07;  /* 1 ms or more */
 
-#define RUN_AT(x) (jiffies + (x))
-
 static void au1k_irda_plat_set_phy_mode(struct au1k_private *p, int mode)
 {
 	if (p->platdata && p->platdata->set_phy_mode)
@@ -620,8 +616,6 @@ static int au1k_irda_start(struct net_device *dev)
 	/* power up */
 	au1k_irda_plat_set_phy_mode(aup, AU1000_IRDA_PHY_MODE_SIR);
 
-	aup->timer.expires = RUN_AT((3 * HZ));
-	aup->timer.data = (unsigned long)dev;
 	return 0;
 }
 
@@ -642,7 +636,6 @@ static int au1k_irda_stop(struct net_device *dev)
 	}
 
 	netif_stop_queue(dev);
-	del_timer(&aup->timer);
 
 	/* disable the interrupt */
 	free_irq(aup->irq_tx, dev);
-- 
2.11.1

[PATCH 2/2] net: irda: au1k_ir: drop useless include

[Manuel Lauss]

remove useless ioport.h include.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
---
 drivers/net/irda/au1k_ir.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c
index bc2a63f5ca8c..be4ea6aa57a9 100644
--- a/drivers/net/irda/au1k_ir.c
+++ b/drivers/net/irda/au1k_ir.c
@@ -25,7 +25,6 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/types.h>
-#include <linux/ioport.h>
 
 #include <net/irda/irda.h>
 #include <net/irda/irmod.h>
-- 
2.11.1

Re: [PATCH 1/2] net: irda: au1k_ir: remove unused timer

[David Miller]

From: Manuel Lauss <manuel.lauss@gmail.com>
Date: Tue, 14 Feb 2017 13:08:03 +0100

> remove the unused timer.  I suppose it was intended as a timeout
> detector, but never properly implemented.
> 
> Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>

Applied to net-next.

Re: [PATCH 2/2] net: irda: au1k_ir: drop useless include

[David Miller]

From: Manuel Lauss <manuel.lauss@gmail.com>
Date: Tue, 14 Feb 2017 13:08:04 +0100

> remove useless ioport.h include.
> 
> Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>

Also applied to net-next, thanks.