Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Stephen Hemminger and committed by
David S. Miller
7d359daa 50014f1b

+2 -24
+2 -24
drivers/net/apne.c
··· 78 78 struct net_device * __init apne_probe(int unit); 79 79 static int apne_probe1(struct net_device *dev, int ioaddr); 80 80 81 - static int apne_open(struct net_device *dev); 82 - static int apne_close(struct net_device *dev); 83 - 84 81 static void apne_reset_8390(struct net_device *dev); 85 82 static void apne_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, 86 83 int ring_page); ··· 311 314 312 315 dev->base_addr = ioaddr; 313 316 dev->irq = IRQ_AMIGA_PORTS; 317 + dev->netdev_ops = &ei_netdev_ops; 314 318 315 319 /* Install the Interrupt handler */ 316 320 i = request_irq(dev->irq, apne_interrupt, IRQF_SHARED, DRV_NAME, dev); ··· 335 337 ei_status.block_input = &apne_block_input; 336 338 ei_status.block_output = &apne_block_output; 337 339 ei_status.get_8390_hdr = &apne_get_8390_hdr; 338 - dev->open = &apne_open; 339 - dev->stop = &apne_close; 340 - #ifdef CONFIG_NET_POLL_CONTROLLER 341 - dev->poll_controller = ei_poll; 342 - #endif 340 + 343 341 NS8390_init(dev, 0); 344 342 345 343 pcmcia_ack_int(pcmcia_get_intreq()); /* ack PCMCIA int req */ ··· 343 349 344 350 apne_owned = 1; 345 351 346 - return 0; 347 - } 348 - 349 - static int 350 - apne_open(struct net_device *dev) 351 - { 352 - ei_open(dev); 353 - return 0; 354 - } 355 - 356 - static int 357 - apne_close(struct net_device *dev) 358 - { 359 - if (ei_debug > 1) 360 - printk("%s: Shutting down ethercard.\n", dev->name); 361 - ei_close(dev); 362 352 return 0; 363 353 } 364 354