diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2008-11-25 21:23:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-25 21:23:59 -0500 |
commit | 9a9aa14a74d49f88e2c2a126b035c22bd1ab0d53 (patch) | |
tree | 337b0b80fc02e9c27a990ea25f9b60cf778d00b7 /drivers/net | |
parent | d269941b5b562d21ae37b2182846702a4a43f415 (diff) |
es3210: convert to net_device_ops
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/es3210.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/drivers/net/es3210.c b/drivers/net/es3210.c index e7df9f4a183d..5569f2ffb62c 100644 --- a/drivers/net/es3210.c +++ b/drivers/net/es3210.c | |||
@@ -64,9 +64,6 @@ static const char version[] = | |||
64 | 64 | ||
65 | static int es_probe1(struct net_device *dev, int ioaddr); | 65 | static int es_probe1(struct net_device *dev, int ioaddr); |
66 | 66 | ||
67 | static int es_open(struct net_device *dev); | ||
68 | static int es_close(struct net_device *dev); | ||
69 | |||
70 | static void es_reset_8390(struct net_device *dev); | 67 | static void es_reset_8390(struct net_device *dev); |
71 | 68 | ||
72 | static void es_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_page); | 69 | static void es_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_page); |
@@ -289,11 +286,7 @@ static int __init es_probe1(struct net_device *dev, int ioaddr) | |||
289 | ei_status.block_output = &es_block_output; | 286 | ei_status.block_output = &es_block_output; |
290 | ei_status.get_8390_hdr = &es_get_8390_hdr; | 287 | ei_status.get_8390_hdr = &es_get_8390_hdr; |
291 | 288 | ||
292 | dev->open = &es_open; | 289 | dev->netdev_ops = &ei_netdev_ops; |
293 | dev->stop = &es_close; | ||
294 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
295 | dev->poll_controller = ei_poll; | ||
296 | #endif | ||
297 | NS8390_init(dev, 0); | 290 | NS8390_init(dev, 0); |
298 | 291 | ||
299 | retval = register_netdev(dev); | 292 | retval = register_netdev(dev); |
@@ -385,22 +378,6 @@ static void es_block_output(struct net_device *dev, int count, | |||
385 | memcpy_toio(shmem, buf, count); | 378 | memcpy_toio(shmem, buf, count); |
386 | } | 379 | } |
387 | 380 | ||
388 | static int es_open(struct net_device *dev) | ||
389 | { | ||
390 | ei_open(dev); | ||
391 | return 0; | ||
392 | } | ||
393 | |||
394 | static int es_close(struct net_device *dev) | ||
395 | { | ||
396 | |||
397 | if (ei_debug > 1) | ||
398 | printk("%s: Shutting down ethercard.\n", dev->name); | ||
399 | |||
400 | ei_close(dev); | ||
401 | return 0; | ||
402 | } | ||
403 | |||
404 | #ifdef MODULE | 381 | #ifdef MODULE |
405 | #define MAX_ES_CARDS 4 /* Max number of ES3210 cards per module */ | 382 | #define MAX_ES_CARDS 4 /* Max number of ES3210 cards per module */ |
406 | #define NAMELEN 8 /* # of chars for storing dev->name */ | 383 | #define NAMELEN 8 /* # of chars for storing dev->name */ |