diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2008-12-03 22:09:30 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-03 22:09:30 -0800 |
| commit | b6114794a1c394534659f4a17420e48cf23aa922 (patch) | |
| tree | 801c91d4a3e34acd2f6ae1a5338c7b3c56b2a6bb | |
| parent | 3e1d7cd2dc708f2054b2180e05ae283b9f91d543 (diff) | |
| download | linux-b6114794a1c394534659f4a17420e48cf23aa922.tar.bz2 | |
zorro8390: convert to net_device_ops
Another device using 8390 library that needs converting.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/Makefile | 2 | ||||
| -rw-r--r-- | drivers/net/zorro8390.c | 22 |
2 files changed, 17 insertions, 7 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index f664e8ddfd40..a1fc8a1b50da 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -190,7 +190,7 @@ obj-$(CONFIG_SC92031) += sc92031.o obj-$(CONFIG_LP486E) += lp486e.o obj-$(CONFIG_ETH16I) += eth16i.o -obj-$(CONFIG_ZORRO8390) += zorro8390.o +obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o obj-$(CONFIG_HPLANCE) += hplance.o 7990.o obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o obj-$(CONFIG_EQUALIZER) += eql.o diff --git a/drivers/net/zorro8390.c b/drivers/net/zorro8390.c index 9c73df4a0d30..affd904deafc 100644 --- a/drivers/net/zorro8390.c +++ b/drivers/net/zorro8390.c @@ -122,7 +122,7 @@ static int __devinit zorro8390_init_one(struct zorro_dev *z, break; board = z->resource.start; ioaddr = board+cards[i].offset; - dev = ____alloc_ei_netdev(0); + dev = alloc_ei_netdev(); if (!dev) return -ENOMEM; if (!request_mem_region(ioaddr, NE_IO_EXTENT*2, DRV_NAME)) { @@ -139,6 +139,20 @@ static int __devinit zorro8390_init_one(struct zorro_dev *z, return 0; } +static const struct net_device_ops zorro8390_netdev_ops = { + .ndo_open = zorro8390_open, + .ndo_stop = zorro8390_close, + .ndo_start_xmit = ei_start_xmit, + .ndo_tx_timeout = ei_tx_timeout, + .ndo_get_stats = ei_get_stats, + .ndo_set_multicast_list = ei_set_multicast_list, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = eth_change_mtu, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = ei_poll, +#endif +}; + static int __devinit zorro8390_init(struct net_device *dev, unsigned long board, const char *name, unsigned long ioaddr) @@ -230,12 +244,8 @@ static int __devinit zorro8390_init(struct net_device *dev, ei_status.block_output = &zorro8390_block_output; ei_status.get_8390_hdr = &zorro8390_get_8390_hdr; ei_status.reg_offset = zorro8390_offsets; - dev->open = &zorro8390_open; - dev->stop = &zorro8390_close; -#ifdef CONFIG_NET_POLL_CONTROLLER - dev->poll_controller = __ei_poll; -#endif + dev->netdev_ops = &zorro8390_netdev_ops; __NS8390_init(dev, 0); err = register_netdev(dev); if (err) { |