aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/dm9000.c34
1 files changed, 0 insertions, 34 deletions
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index ec9730aee1e3..d42cb734c5ea 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -81,8 +81,6 @@
81#define CARDNAME "dm9000" 81#define CARDNAME "dm9000"
82#define PFX CARDNAME ": " 82#define PFX CARDNAME ": "
83 83
84#define DM9000_TIMER_WUT jiffies+(HZ*2) /* timer wakeup time : 2 second */
85
86#ifdef CONFIG_BLACKFIN 84#ifdef CONFIG_BLACKFIN
87#define readsb insb 85#define readsb insb
88#define readsw insw 86#define readsw insw
@@ -131,7 +129,6 @@ typedef struct board_info {
131 struct resource *data_req; 129 struct resource *data_req;
132 struct resource *irq_res; 130 struct resource *irq_res;
133 131
134 struct timer_list timer;
135 unsigned char srom[128]; 132 unsigned char srom[128];
136 spinlock_t lock; 133 spinlock_t lock;
137 134
@@ -154,8 +151,6 @@ static int dm9000_open(struct net_device *);
154static int dm9000_start_xmit(struct sk_buff *, struct net_device *); 151static int dm9000_start_xmit(struct sk_buff *, struct net_device *);
155static int dm9000_stop(struct net_device *); 152static int dm9000_stop(struct net_device *);
156 153
157
158static void dm9000_timer(unsigned long);
159static void dm9000_init_dm9000(struct net_device *); 154static void dm9000_init_dm9000(struct net_device *);
160 155
161static irqreturn_t dm9000_interrupt(int, void *); 156static irqreturn_t dm9000_interrupt(int, void *);
@@ -638,13 +633,6 @@ dm9000_open(struct net_device *dev)
638 /* Init driver variable */ 633 /* Init driver variable */
639 db->dbug_cnt = 0; 634 db->dbug_cnt = 0;
640 635
641 /* set and active a timer process */
642 init_timer(&db->timer);
643 db->timer.expires = DM9000_TIMER_WUT;
644 db->timer.data = (unsigned long) dev;
645 db->timer.function = &dm9000_timer;
646 add_timer(&db->timer);
647
648 mii_check_media(&db->mii, netif_msg_link(db), 1); 636 mii_check_media(&db->mii, netif_msg_link(db), 1);
649 netif_start_queue(dev); 637 netif_start_queue(dev);
650 638
@@ -766,9 +754,6 @@ dm9000_stop(struct net_device *ndev)
766 754
767 dm9000_dbg(db, 1, "entering %s\n", __func__); 755 dm9000_dbg(db, 1, "entering %s\n", __func__);
768 756
769 /* deleted timer */
770 del_timer(&db->timer);
771
772 netif_stop_queue(ndev); 757 netif_stop_queue(ndev);
773 netif_carrier_off(ndev); 758 netif_carrier_off(ndev);
774 759
@@ -849,25 +834,6 @@ dm9000_interrupt(int irq, void *dev_id)
849 return IRQ_HANDLED; 834 return IRQ_HANDLED;
850} 835}
851 836
852/*
853 * A periodic timer routine
854 * Dynamic media sense, allocated Rx buffer...
855 */
856static void
857dm9000_timer(unsigned long data)
858{
859 struct net_device *dev = (struct net_device *) data;
860 board_info_t *db = (board_info_t *) dev->priv;
861
862 dm9000_dbg(db, 3, "entering %s\n", __func__);
863
864 mii_check_media(&db->mii, netif_msg_link(db), 0);
865
866 /* Set timer again */
867 db->timer.expires = DM9000_TIMER_WUT;
868 add_timer(&db->timer);
869}
870
871struct dm9000_rxhdr { 837struct dm9000_rxhdr {
872 u8 RxPktReady; 838 u8 RxPktReady;
873 u8 RxStatus; 839 u8 RxStatus;