From d88f660716b785f96518cf6fe8ea4e6d8486b126 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Tue, 25 Nov 2008 18:24:38 -0800
Subject: [PATCH] --- yaml --- r: 122239 b: refs/heads/master c:
 0ec4d4fe413f4d16fb35a326a2dcf912872abcc8 h: refs/heads/master i:   122237:
 ed4f97bc2925e9858b6376fb21ca9f936ee29e53   122235:
 56a35a524648b0c13f77f974ba672d2c4a193d86   122231:
 1bf4889345e6894b2a0711f35143bd1b74777591   122223:
 2d4f6fd02cd6ff125bccb0f787cf0ce0b243ba72   122207:
 213a25e1fc8192fd0539bf2e64cb3f2e7c3ae714   122175:
 f612b7a154f76df0b50f4f6aa306a47e4816f60c   122111:
 5ca8caff03b2d6940d572238608bd91128b6a39a v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/net/lne390.c | 24 +-----------------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index e74603dcde9e..723bc86094ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8284abea9b49f9d8eae5b3ed36a9ea76a26388ca
+refs/heads/master: 0ec4d4fe413f4d16fb35a326a2dcf912872abcc8
diff --git a/trunk/drivers/net/lne390.c b/trunk/drivers/net/lne390.c
index bc70d5e79ab1..41cbaaef0654 100644
--- a/trunk/drivers/net/lne390.c
+++ b/trunk/drivers/net/lne390.c
@@ -53,9 +53,6 @@ static const char *version =
 
 static int lne390_probe1(struct net_device *dev, int ioaddr);
 
-static int lne390_open(struct net_device *dev);
-static int lne390_close(struct net_device *dev);
-
 static void lne390_reset_8390(struct net_device *dev);
 
 static void lne390_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_page);
@@ -278,11 +275,7 @@ static int __init lne390_probe1(struct net_device *dev, int ioaddr)
 	ei_status.block_output = &lne390_block_output;
 	ei_status.get_8390_hdr = &lne390_get_8390_hdr;
 
-	dev->open = &lne390_open;
-	dev->stop = &lne390_close;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-	dev->poll_controller = ei_poll;
-#endif
+	dev->netdev_ops = &ei_netdev_ops;
 	NS8390_init(dev, 0);
 
 	ret = register_netdev(dev);
@@ -374,21 +367,6 @@ static void lne390_block_output(struct net_device *dev, int count,
 	memcpy_toio(shmem, buf, count);
 }
 
-static int lne390_open(struct net_device *dev)
-{
-	ei_open(dev);
-	return 0;
-}
-
-static int lne390_close(struct net_device *dev)
-{
-
-	if (ei_debug > 1)
-		printk("%s: Shutting down ethercard.\n", dev->name);
-
-	ei_close(dev);
-	return 0;
-}
 
 #ifdef MODULE
 #define MAX_LNE_CARDS	4	/* Max number of LNE390 cards per module */