aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ne.c24
1 files changed, 2 insertions, 22 deletions
diff --git a/drivers/net/ne.c b/drivers/net/ne.c
index f708712a374a..cb02698d1286 100644
--- a/drivers/net/ne.c
+++ b/drivers/net/ne.c
@@ -174,9 +174,6 @@ bad_clone_list[] __initdata = {
174static int ne_probe1(struct net_device *dev, unsigned long ioaddr); 174static int ne_probe1(struct net_device *dev, unsigned long ioaddr);
175static int ne_probe_isapnp(struct net_device *dev); 175static int ne_probe_isapnp(struct net_device *dev);
176 176
177static int ne_open(struct net_device *dev);
178static int ne_close(struct net_device *dev);
179
180static void ne_reset_8390(struct net_device *dev); 177static void ne_reset_8390(struct net_device *dev);
181static void ne_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, 178static void ne_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,
182 int ring_page); 179 int ring_page);
@@ -536,11 +533,8 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
536 ei_status.block_output = &ne_block_output; 533 ei_status.block_output = &ne_block_output;
537 ei_status.get_8390_hdr = &ne_get_8390_hdr; 534 ei_status.get_8390_hdr = &ne_get_8390_hdr;
538 ei_status.priv = 0; 535 ei_status.priv = 0;
539 dev->open = &ne_open; 536
540 dev->stop = &ne_close; 537 dev->netdev_ops = &eip_netdev_ops;
541#ifdef CONFIG_NET_POLL_CONTROLLER
542 dev->poll_controller = eip_poll;
543#endif
544 NS8390p_init(dev, 0); 538 NS8390p_init(dev, 0);
545 539
546 ret = register_netdev(dev); 540 ret = register_netdev(dev);
@@ -557,20 +551,6 @@ err_out:
557 return ret; 551 return ret;
558} 552}
559 553
560static int ne_open(struct net_device *dev)
561{
562 eip_open(dev);
563 return 0;
564}
565
566static int ne_close(struct net_device *dev)
567{
568 if (ei_debug > 1)
569 printk(KERN_DEBUG "%s: Shutting down ethercard.\n", dev->name);
570 eip_close(dev);
571 return 0;
572}
573
574/* Hard reset the card. This used to pause for the same period that a 554/* Hard reset the card. This used to pause for the same period that a
575 8390 reset command required, but that shouldn't be necessary. */ 555 8390 reset command required, but that shouldn't be necessary. */
576 556