diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-05-02 11:02:41 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-05-02 11:02:41 +0200 |
| commit | 4d6ca227c768b50b05cf183974b40abe444e9d0c (patch) | |
| tree | bf953d8e895281053548b9967a2c4b58d641df00 /drivers/net/irda/au1k_ir.c | |
| parent | 800f3eef8ebc1264e9c135bfa892c8ae41fa4792 (diff) | |
| parent | af22a610bc38508d5ea760507d31be6b6983dfa8 (diff) | |
Merge branch 'for-4.12/asus' into for-linus
Diffstat (limited to 'drivers/net/irda/au1k_ir.c')
| -rw-r--r-- | drivers/net/irda/au1k_ir.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c index 44e4f386a5dc..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> @@ -169,8 +168,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 +175,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 +615,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 +635,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); |