Commit d079841d authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller

smc: convert to net_device_ops

Convert both eisa and mca versions of this driver, though I doubt
anyone still has the hardware.
Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d4a97d42
...@@ -182,6 +182,22 @@ static char *smc_mca_adapter_names[] __initdata = { ...@@ -182,6 +182,22 @@ static char *smc_mca_adapter_names[] __initdata = {
static int ultra_found = 0; static int ultra_found = 0;
static const struct net_device_ops ultra_netdev_ops = {
.ndo_open = ultramca_open,
.ndo_stop = ultramca_close_card,
.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 __init ultramca_probe(struct device *gen_dev) static int __init ultramca_probe(struct device *gen_dev)
{ {
unsigned short ioaddr; unsigned short ioaddr;
...@@ -384,11 +400,7 @@ static int __init ultramca_probe(struct device *gen_dev) ...@@ -384,11 +400,7 @@ static int __init ultramca_probe(struct device *gen_dev)
ei_status.priv = slot; ei_status.priv = slot;
dev->open = &ultramca_open; dev->netdev_ops = &ultramca_netdev_ops;
dev->stop = &ultramca_close_card;
#ifdef CONFIG_NET_POLL_CONTROLLER
dev->poll_controller = ei_poll;
#endif
NS8390_init(dev, 0); NS8390_init(dev, 0);
......
...@@ -187,6 +187,21 @@ out: ...@@ -187,6 +187,21 @@ out:
} }
#endif #endif
static const struct net_device_ops ultra_netdev_ops = {
.ndo_open = ultra_open,
.ndo_stop = ultra_close_card,
.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 __init ultra_probe1(struct net_device *dev, int ioaddr) static int __init ultra_probe1(struct net_device *dev, int ioaddr)
{ {
int i, retval; int i, retval;
...@@ -300,11 +315,8 @@ static int __init ultra_probe1(struct net_device *dev, int ioaddr) ...@@ -300,11 +315,8 @@ static int __init ultra_probe1(struct net_device *dev, int ioaddr)
ei_status.get_8390_hdr = &ultra_get_8390_hdr; ei_status.get_8390_hdr = &ultra_get_8390_hdr;
} }
ei_status.reset_8390 = &ultra_reset_8390; ei_status.reset_8390 = &ultra_reset_8390;
dev->open = &ultra_open;
dev->stop = &ultra_close_card; dev->netdev_ops = &ultra_netdev_ops;
#ifdef CONFIG_NET_POLL_CONTROLLER
dev->poll_controller = ei_poll;
#endif
NS8390_init(dev, 0); NS8390_init(dev, 0);
retval = register_netdev(dev); retval = register_netdev(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment