Skip to content

Commit

Permalink
ne2000: convert to net_device_ops
Browse files Browse the repository at this point in the history
Last driver for today.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Nov 26, 2008
1 parent 53cdd28 commit 4ef8e76
Showing 1 changed file with 2 additions and 22 deletions.
24 changes: 2 additions & 22 deletions drivers/net/ne.c
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,6 @@ bad_clone_list[] __initdata = {
static int ne_probe1(struct net_device *dev, unsigned long ioaddr);
static int ne_probe_isapnp(struct net_device *dev);

static int ne_open(struct net_device *dev);
static int ne_close(struct net_device *dev);

static void ne_reset_8390(struct net_device *dev);
static void ne_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,
int ring_page);
Expand Down Expand Up @@ -536,11 +533,8 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
ei_status.block_output = &ne_block_output;
ei_status.get_8390_hdr = &ne_get_8390_hdr;
ei_status.priv = 0;
dev->open = &ne_open;
dev->stop = &ne_close;
#ifdef CONFIG_NET_POLL_CONTROLLER
dev->poll_controller = eip_poll;
#endif

dev->netdev_ops = &eip_netdev_ops;
NS8390p_init(dev, 0);

ret = register_netdev(dev);
Expand All @@ -557,20 +551,6 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
return ret;
}

static int ne_open(struct net_device *dev)
{
eip_open(dev);
return 0;
}

static int ne_close(struct net_device *dev)
{
if (ei_debug > 1)
printk(KERN_DEBUG "%s: Shutting down ethercard.\n", dev->name);
eip_close(dev);
return 0;
}

/* Hard reset the card. This used to pause for the same period that a
8390 reset command required, but that shouldn't be necessary. */

Expand Down

0 comments on commit 4ef8e76

Please sign in to comment.