diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-23 18:13:33 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-23 18:13:33 +1100 |
| commit | 0e7a5369f960b32b53367d6bbeba76731b393072 (patch) | |
| tree | 4196cb67ac3865da05f642ad725032a137cca849 | |
| parent | a5ed641dfcb845af3f402c395a590f41d133b272 (diff) | |
Revert "com20020: convert to net_devic_ops"
This reverts commit a1799af4d7deefccdaa9d222a886fa1373dbb49a.
| -rw-r--r-- | drivers/net/arcnet/com20020-isa.c | 2 | ||||
| -rw-r--r-- | drivers/net/arcnet/com20020-pci.c | 3 | ||||
| -rw-r--r-- | drivers/net/arcnet/com20020.c | 10 | ||||
| -rw-r--r-- | include/linux/com20020.h | 1 |
4 files changed, 2 insertions, 14 deletions
diff --git a/drivers/net/arcnet/com20020-isa.c b/drivers/net/arcnet/com20020-isa.c index db08fc24047a..ea53a940272f 100644 --- a/drivers/net/arcnet/com20020-isa.c +++ b/drivers/net/arcnet/com20020-isa.c @@ -151,8 +151,6 @@ static int __init com20020_init(void) if (node && node != 0xff) dev->dev_addr[0] = node; - dev->netdev_ops = &com20020_netdev_ops; - lp = netdev_priv(dev); lp->backplane = backplane; lp->clockp = clockp & 7; diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c index dbf4de39754d..8b51f632581d 100644 --- a/drivers/net/arcnet/com20020-pci.c +++ b/drivers/net/arcnet/com20020-pci.c @@ -72,9 +72,6 @@ static int __devinit com20020pci_probe(struct pci_dev *pdev, const struct pci_de dev = alloc_arcdev(device); if (!dev) return -ENOMEM; - - dev->netdev_ops = &com20020_netdev_ops; - lp = netdev_priv(dev); pci_set_drvdata(pdev, dev); diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c index bbe8f2ccdadb..103688358fb8 100644 --- a/drivers/net/arcnet/com20020.c +++ b/drivers/net/arcnet/com20020.c @@ -149,14 +149,6 @@ int com20020_check(struct net_device *dev) return 0; } -const struct net_device_ops com20020_netdev_ops = { - .ndo_open = arcnet_open, - .ndo_stop = arcnet_close, - .ndo_start_xmit = arcnet_send_packet, - .ndo_tx_timeout = arcnet_timeout, - .ndo_set_multicast_list = com20020_set_mc_list, -}; - /* Set up the struct net_device associated with this card. Called after * probing succeeds. */ @@ -178,6 +170,8 @@ int com20020_found(struct net_device *dev, int shared) lp->hw.copy_from_card = com20020_copy_from_card; lp->hw.close = com20020_close; + dev->set_multicast_list = com20020_set_mc_list; + if (!dev->dev_addr[0]) dev->dev_addr[0] = inb(ioaddr + BUS_ALIGN*8); /* FIXME: do this some other way! */ diff --git a/include/linux/com20020.h b/include/linux/com20020.h index 350afa773f8f..ac6d9a43e085 100644 --- a/include/linux/com20020.h +++ b/include/linux/com20020.h @@ -29,7 +29,6 @@ int com20020_check(struct net_device *dev); int com20020_found(struct net_device *dev, int shared); -const struct net_device_ops com20020_netdev_ops; /* The number of low I/O ports used by the card. */ #define ARCNET_TOTAL_SIZE 8 |