Skip to content

Commit

Permalink
wd: use net_device_ops
Browse files Browse the repository at this point in the history
Another driver converted to net_device_ops; Compile tested only.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Nov 26, 2008
1 parent 8884c09 commit 458228b
Showing 1 changed file with 17 additions and 7 deletions.
24 changes: 17 additions & 7 deletions drivers/net/wd.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,20 @@ struct net_device * __init wd_probe(int unit)
}
#endif

static const struct net_device_ops wd_netdev_ops = {
.ndo_open = wd_open,
.ndo_stop = wd_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 __init wd_probe1(struct net_device *dev, int ioaddr)
{
int i;
Expand Down Expand Up @@ -331,11 +345,8 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)
ei_status.block_input = &wd_block_input;
ei_status.block_output = &wd_block_output;
ei_status.get_8390_hdr = &wd_get_8390_hdr;
dev->open = &wd_open;
dev->stop = &wd_close;
#ifdef CONFIG_NET_POLL_CONTROLLER
dev->poll_controller = ei_poll;
#endif

dev->netdev_ops = &wd_netdev_ops;
NS8390_init(dev, 0);

#if 1
Expand Down Expand Up @@ -365,8 +376,7 @@ wd_open(struct net_device *dev)
outb(ei_status.reg5, ioaddr+WD_CMDREG5);
outb(ei_status.reg0, ioaddr); /* WD_CMDREG */

ei_open(dev);
return 0;
return ei_open(dev);
}

static void
Expand Down

0 comments on commit 458228b

Please sign in to comment.