Skip to content

Commit

Permalink
DM9000: Remove old timer based poll routines
Browse files Browse the repository at this point in the history
Remove the timer based MII phy polling, as this is
currently broken with the new EEPROM code that now
uses mutexes to protect the phy access.

This will need to be replaced in the future by some
form of mutex safe mechanism for reading the MII
phy status.

The replacement has not been done here as changing
this patch, which is early in the sequence has quite
a knock-on effect. Once this series is merged, then
a new presentation of an patch to poll the MII link
status can be added.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Ben Dooks authored and Jeff Garzik committed Feb 11, 2008
1 parent 1a5f1c4 commit fcfa81a
Showing 1 changed file with 0 additions and 34 deletions.
34 changes: 0 additions & 34 deletions drivers/net/dm9000.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@
#define CARDNAME "dm9000"
#define PFX CARDNAME ": "

#define DM9000_TIMER_WUT jiffies+(HZ*2) /* timer wakeup time : 2 second */

#ifdef CONFIG_BLACKFIN
#define readsb insb
#define readsw insw
Expand Down Expand Up @@ -131,7 +129,6 @@ typedef struct board_info {
struct resource *data_req;
struct resource *irq_res;

struct timer_list timer;
unsigned char srom[128];
spinlock_t lock;

Expand All @@ -154,8 +151,6 @@ static int dm9000_open(struct net_device *);
static int dm9000_start_xmit(struct sk_buff *, struct net_device *);
static int dm9000_stop(struct net_device *);


static void dm9000_timer(unsigned long);
static void dm9000_init_dm9000(struct net_device *);

static irqreturn_t dm9000_interrupt(int, void *);
Expand Down Expand Up @@ -638,13 +633,6 @@ dm9000_open(struct net_device *dev)
/* Init driver variable */
db->dbug_cnt = 0;

/* set and active a timer process */
init_timer(&db->timer);
db->timer.expires = DM9000_TIMER_WUT;
db->timer.data = (unsigned long) dev;
db->timer.function = &dm9000_timer;
add_timer(&db->timer);

mii_check_media(&db->mii, netif_msg_link(db), 1);
netif_start_queue(dev);

Expand Down Expand Up @@ -766,9 +754,6 @@ dm9000_stop(struct net_device *ndev)

dm9000_dbg(db, 1, "entering %s\n", __func__);

/* deleted timer */
del_timer(&db->timer);

netif_stop_queue(ndev);
netif_carrier_off(ndev);

Expand Down Expand Up @@ -849,25 +834,6 @@ dm9000_interrupt(int irq, void *dev_id)
return IRQ_HANDLED;
}

/*
* A periodic timer routine
* Dynamic media sense, allocated Rx buffer...
*/
static void
dm9000_timer(unsigned long data)
{
struct net_device *dev = (struct net_device *) data;
board_info_t *db = (board_info_t *) dev->priv;

dm9000_dbg(db, 3, "entering %s\n", __func__);

mii_check_media(&db->mii, netif_msg_link(db), 0);

/* Set timer again */
db->timer.expires = DM9000_TIMER_WUT;
add_timer(&db->timer);
}

struct dm9000_rxhdr {
u8 RxPktReady;
u8 RxStatus;
Expand Down

0 comments on commit fcfa81a

Please sign in to comment.