diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2008-11-25 21:23:35 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-25 21:23:35 -0500 |
commit | d269941b5b562d21ae37b2182846702a4a43f415 (patch) | |
tree | 65448d2443e57fc1ca4ed72414d8de70a21f365d /drivers/net/ne3210.c | |
parent | d079841d795b83822357ef058ce8d7979dad854c (diff) |
ne3210: convert to net_device_ops
By having common code in 8390.o don't need net_dev_ops in
the driver.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ne3210.c')
-rw-r--r-- | drivers/net/ne3210.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/drivers/net/ne3210.c b/drivers/net/ne3210.c index 6681ca748c74..fac43fd6fc87 100644 --- a/drivers/net/ne3210.c +++ b/drivers/net/ne3210.c | |||
@@ -45,9 +45,6 @@ | |||
45 | 45 | ||
46 | #define DRV_NAME "ne3210" | 46 | #define DRV_NAME "ne3210" |
47 | 47 | ||
48 | static int ne3210_open(struct net_device *dev); | ||
49 | static int ne3210_close(struct net_device *dev); | ||
50 | |||
51 | static void ne3210_reset_8390(struct net_device *dev); | 48 | static void ne3210_reset_8390(struct net_device *dev); |
52 | 49 | ||
53 | static void ne3210_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_page); | 50 | static void ne3210_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_page); |
@@ -199,11 +196,8 @@ static int __init ne3210_eisa_probe (struct device *device) | |||
199 | ei_status.block_output = &ne3210_block_output; | 196 | ei_status.block_output = &ne3210_block_output; |
200 | ei_status.get_8390_hdr = &ne3210_get_8390_hdr; | 197 | ei_status.get_8390_hdr = &ne3210_get_8390_hdr; |
201 | 198 | ||
202 | dev->open = &ne3210_open; | 199 | dev->netdev_ops = &ei_netdev_ops; |
203 | dev->stop = &ne3210_close; | 200 | |
204 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
205 | dev->poll_controller = ei_poll; | ||
206 | #endif | ||
207 | dev->if_port = ifmap_val[port_index]; | 201 | dev->if_port = ifmap_val[port_index]; |
208 | 202 | ||
209 | if ((retval = register_netdev (dev))) | 203 | if ((retval = register_netdev (dev))) |
@@ -320,22 +314,6 @@ static void ne3210_block_output(struct net_device *dev, int count, | |||
320 | memcpy_toio(shmem, buf, count); | 314 | memcpy_toio(shmem, buf, count); |
321 | } | 315 | } |
322 | 316 | ||
323 | static int ne3210_open(struct net_device *dev) | ||
324 | { | ||
325 | ei_open(dev); | ||
326 | return 0; | ||
327 | } | ||
328 | |||
329 | static int ne3210_close(struct net_device *dev) | ||
330 | { | ||
331 | |||
332 | if (ei_debug > 1) | ||
333 | printk("%s: Shutting down ethercard.\n", dev->name); | ||
334 | |||
335 | ei_close(dev); | ||
336 | return 0; | ||
337 | } | ||
338 | |||
339 | static struct eisa_device_id ne3210_ids[] = { | 317 | static struct eisa_device_id ne3210_ids[] = { |
340 | { "EGL0101" }, | 318 | { "EGL0101" }, |
341 | { "NVL1801" }, | 319 | { "NVL1801" }, |