aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2008-11-25 21:25:32 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-25 21:25:32 -0500
commit7d359daafe12b36b6da7ec6247caddf534183aed (patch)
treef0c072174af0f92562dc25bf4166877ad081bc06 /drivers/net
parent50014f1b939dff5e591e8aea9ec2932d146d2996 (diff)
apne: convert to net_device_ops
Yet another driver. 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/apne.c26
1 files changed, 2 insertions, 24 deletions
diff --git a/drivers/net/apne.c b/drivers/net/apne.c
index 7426f6940630..1437f5d12121 100644
--- a/drivers/net/apne.c
+++ b/drivers/net/apne.c
@@ -78,9 +78,6 @@
78struct net_device * __init apne_probe(int unit); 78struct net_device * __init apne_probe(int unit);
79static int apne_probe1(struct net_device *dev, int ioaddr); 79static int apne_probe1(struct net_device *dev, int ioaddr);
80 80
81static int apne_open(struct net_device *dev);
82static int apne_close(struct net_device *dev);
83
84static void apne_reset_8390(struct net_device *dev); 81static void apne_reset_8390(struct net_device *dev);
85static void apne_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, 82static void apne_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,
86 int ring_page); 83 int ring_page);
@@ -314,6 +311,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
314 311
315 dev->base_addr = ioaddr; 312 dev->base_addr = ioaddr;
316 dev->irq = IRQ_AMIGA_PORTS; 313 dev->irq = IRQ_AMIGA_PORTS;
314 dev->netdev_ops = &ei_netdev_ops;
317 315
318 /* Install the Interrupt handler */ 316 /* Install the Interrupt handler */
319 i = request_irq(dev->irq, apne_interrupt, IRQF_SHARED, DRV_NAME, dev); 317 i = request_irq(dev->irq, apne_interrupt, IRQF_SHARED, DRV_NAME, dev);
@@ -337,11 +335,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
337 ei_status.block_input = &apne_block_input; 335 ei_status.block_input = &apne_block_input;
338 ei_status.block_output = &apne_block_output; 336 ei_status.block_output = &apne_block_output;
339 ei_status.get_8390_hdr = &apne_get_8390_hdr; 337 ei_status.get_8390_hdr = &apne_get_8390_hdr;
340 dev->open = &apne_open; 338
341 dev->stop = &apne_close;
342#ifdef CONFIG_NET_POLL_CONTROLLER
343 dev->poll_controller = ei_poll;
344#endif
345 NS8390_init(dev, 0); 339 NS8390_init(dev, 0);
346 340
347 pcmcia_ack_int(pcmcia_get_intreq()); /* ack PCMCIA int req */ 341 pcmcia_ack_int(pcmcia_get_intreq()); /* ack PCMCIA int req */
@@ -352,22 +346,6 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
352 return 0; 346 return 0;
353} 347}
354 348
355static int
356apne_open(struct net_device *dev)
357{
358 ei_open(dev);
359 return 0;
360}
361
362static int
363apne_close(struct net_device *dev)
364{
365 if (ei_debug > 1)
366 printk("%s: Shutting down ethercard.\n", dev->name);
367 ei_close(dev);
368 return 0;
369}
370
371/* Hard reset the card. This used to pause for the same period that a 349/* Hard reset the card. This used to pause for the same period that a
372 8390 reset command required, but that shouldn't be necessary. */ 350 8390 reset command required, but that shouldn't be necessary. */
373static void 351static void