git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ath9k: Add open loop power control support for AR9287.
[pandora-kernel.git]
/
drivers
/
net
/
lne390.c
diff --git
a/drivers/net/lne390.c
b/drivers/net/lne390.c
index
b369890
..
41cbaae
100644
(file)
--- a/
drivers/net/lne390.c
+++ b/
drivers/net/lne390.c
@@
-53,9
+53,6
@@
static const char *version =
static int lne390_probe1(struct net_device *dev, int ioaddr);
static int lne390_probe1(struct net_device *dev, int ioaddr);
-static int lne390_open(struct net_device *dev);
-static int lne390_close(struct net_device *dev);
-
static void lne390_reset_8390(struct net_device *dev);
static void lne390_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_page);
static void lne390_reset_8390(struct net_device *dev);
static void lne390_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_page);
@@
-169,7
+166,6
@@
static int __init lne390_probe1(struct net_device *dev, int ioaddr)
{
int i, revision, ret;
unsigned long eisa_id;
{
int i, revision, ret;
unsigned long eisa_id;
- DECLARE_MAC_BUF(mac);
if (inb_p(ioaddr + LNE390_ID_PORT) == 0xff) return -ENODEV;
if (inb_p(ioaddr + LNE390_ID_PORT) == 0xff) return -ENODEV;
@@
-203,8
+199,8
@@
static int __init lne390_probe1(struct net_device *dev, int ioaddr)
for(i = 0; i < ETHER_ADDR_LEN; i++)
dev->dev_addr[i] = inb(ioaddr + LNE390_SA_PROM + i);
for(i = 0; i < ETHER_ADDR_LEN; i++)
dev->dev_addr[i] = inb(ioaddr + LNE390_SA_PROM + i);
- printk("lne390.c: LNE390%X in EISA slot %d, address %
s
.\n",
- 0xa+revision, ioaddr/0x1000,
print_mac(mac, dev->dev_addr)
);
+ printk("lne390.c: LNE390%X in EISA slot %d, address %
pM
.\n",
+ 0xa+revision, ioaddr/0x1000,
dev->dev_addr
);
printk("lne390.c: ");
printk("lne390.c: ");
@@
-279,11
+275,7
@@
static int __init lne390_probe1(struct net_device *dev, int ioaddr)
ei_status.block_output = &lne390_block_output;
ei_status.get_8390_hdr = &lne390_get_8390_hdr;
ei_status.block_output = &lne390_block_output;
ei_status.get_8390_hdr = &lne390_get_8390_hdr;
- dev->open = &lne390_open;
- dev->stop = &lne390_close;
-#ifdef CONFIG_NET_POLL_CONTROLLER
- dev->poll_controller = ei_poll;
-#endif
+ dev->netdev_ops = &ei_netdev_ops;
NS8390_init(dev, 0);
ret = register_netdev(dev);
NS8390_init(dev, 0);
ret = register_netdev(dev);
@@
-375,21
+367,6
@@
static void lne390_block_output(struct net_device *dev, int count,
memcpy_toio(shmem, buf, count);
}
memcpy_toio(shmem, buf, count);
}
-static int lne390_open(struct net_device *dev)
-{
- ei_open(dev);
- return 0;
-}
-
-static int lne390_close(struct net_device *dev)
-{
-
- if (ei_debug > 1)
- printk("%s: Shutting down ethercard.\n", dev->name);
-
- ei_close(dev);
- return 0;
-}
#ifdef MODULE
#define MAX_LNE_CARDS 4 /* Max number of LNE390 cards per module */
#ifdef MODULE
#define MAX_LNE_CARDS 4 /* Max number of LNE390 cards per module */