lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apne: convert to net_device_ops

Browse Source 
Yet another driver.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger
2008-11-25 18:25:32 -08:00
committed by David S. Miller
parent 50014f1b93
commit 7d359daafe
1 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/apne.c
View File

@@ -78,9 +78,6 @@
struct net_device * __init apne_probe(int unit); struct net_device * __init apne_probe(int unit);
static int apne_probe1(struct net_device *dev, int ioaddr); static int apne_probe1(struct net_device *dev, int ioaddr);
static int apne_open(struct net_device *dev);
static int apne_close(struct net_device *dev);
static void apne_reset_8390(struct net_device *dev); static void apne_reset_8390(struct net_device *dev);
static void apne_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, static void apne_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,
int ring_page); int ring_page);
@@ -314,6 +311,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
dev->base_addr = ioaddr; dev->base_addr = ioaddr;
dev->irq = IRQ_AMIGA_PORTS; dev->irq = IRQ_AMIGA_PORTS;
dev->netdev_ops = &ei_netdev_ops;
/* Install the Interrupt handler */ /* Install the Interrupt handler */
i = request_irq(dev->irq, apne_interrupt, IRQF_SHARED, DRV_NAME, dev); 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)
ei_status.block_input = &apne_block_input; ei_status.block_input = &apne_block_input;
ei_status.block_output = &apne_block_output; ei_status.block_output = &apne_block_output;
ei_status.get_8390_hdr = &apne_get_8390_hdr; ei_status.get_8390_hdr = &apne_get_8390_hdr;
dev->open = &apne_open;
dev->stop = &apne_close;
#ifdef CONFIG_NET_POLL_CONTROLLER
dev->poll_controller = ei_poll;
#endif
NS8390_init(dev, 0); NS8390_init(dev, 0);
pcmcia_ack_int(pcmcia_get_intreq()); /* ack PCMCIA int req */ 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)
return 0; return 0;
} }
static int
apne_open(struct net_device *dev)
{
ei_open(dev);
return 0;
}
static int
apne_close(struct net_device *dev)
{
if (ei_debug > 1)
printk("%s: Shutting down ethercard.\n", dev->name);
ei_close(dev);
return 0;
}
/* Hard reset the card. This used to pause for the same period that a /* Hard reset the card. This used to pause for the same period that a
8390 reset command required, but that shouldn't be necessary. */ 8390 reset command required, but that shouldn't be necessary. */
static void static void