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
drivers/net: fix sparse warning: use ANSI-style function declaration
[pandora-kernel.git]
/
drivers
/
net
/
ne.c
diff --git
a/drivers/net/ne.c
b/drivers/net/ne.c
index
eb681c0
..
5c3e242
100644
(file)
--- a/
drivers/net/ne.c
+++ b/
drivers/net/ne.c
@@
-174,9
+174,6
@@
bad_clone_list[] __initdata = {
static int ne_probe1(struct net_device *dev, unsigned long ioaddr);
static int ne_probe_isapnp(struct net_device *dev);
static int ne_probe1(struct net_device *dev, unsigned long ioaddr);
static int ne_probe_isapnp(struct net_device *dev);
-static int ne_open(struct net_device *dev);
-static int ne_close(struct net_device *dev);
-
static void ne_reset_8390(struct net_device *dev);
static void ne_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,
int ring_page);
static void ne_reset_8390(struct net_device *dev);
static void ne_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,
int ring_page);
@@
-297,7
+294,6
@@
static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
int neX000, ctron, copam, bad_card;
int reg0, ret;
static unsigned version_printed;
int neX000, ctron, copam, bad_card;
int reg0, ret;
static unsigned version_printed;
- DECLARE_MAC_BUF(mac);
if (!request_region(ioaddr, NE_IO_EXTENT, DRV_NAME))
return -EBUSY;
if (!request_region(ioaddr, NE_IO_EXTENT, DRV_NAME))
return -EBUSY;
@@
-517,7
+513,7
@@
static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
}
#endif
}
#endif
- printk("%
s\n", print_mac(mac, dev->dev_addr)
);
+ printk("%
pM\n", dev->dev_addr
);
ei_status.name = name;
ei_status.tx_start_page = start_page;
ei_status.name = name;
ei_status.tx_start_page = start_page;
@@
-537,11
+533,8
@@
static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
ei_status.block_output = &ne_block_output;
ei_status.get_8390_hdr = &ne_get_8390_hdr;
ei_status.priv = 0;
ei_status.block_output = &ne_block_output;
ei_status.get_8390_hdr = &ne_get_8390_hdr;
ei_status.priv = 0;
- dev->open = &ne_open;
- dev->stop = &ne_close;
-#ifdef CONFIG_NET_POLL_CONTROLLER
- dev->poll_controller = eip_poll;
-#endif
+
+ dev->netdev_ops = &eip_netdev_ops;
NS8390p_init(dev, 0);
ret = register_netdev(dev);
NS8390p_init(dev, 0);
ret = register_netdev(dev);
@@
-558,20
+551,6
@@
err_out:
return ret;
}
return ret;
}
-static int ne_open(struct net_device *dev)
-{
- eip_open(dev);
- return 0;
-}
-
-static int ne_close(struct net_device *dev)
-{
- if (ei_debug > 1)
- printk(KERN_DEBUG "%s: Shutting down ethercard.\n", dev->name);
- eip_close(dev);
- return 0;
-}
-
/* Hard reset the card. This used to pause for the same period that a
8390 reset command required, but that shouldn't be necessary. */
/* Hard reset the card. This used to pause for the same period that a
8390 reset command required, but that shouldn't be necessary. */
@@
-950,7
+929,7
@@
static void __init ne_add_devices(void)
}
#ifdef MODULE
}
#ifdef MODULE
-int __init init_module()
+int __init init_module(
void
)
{
int retval;
ne_add_devices();
{
int retval;
ne_add_devices();