wl1251: rename reg.h to wl1251_reg.h

[safe/jmp/linux-2.6] / drivers / net / ne-h8300.c

diff --git a/drivers/net/ne-h8300.c b/drivers/net/ne-h8300.c
index fbc7531..7bd6662 100644 (file)
--- a/drivers/net/ne-h8300.c
+++ b/drivers/net/ne-h8300.c
@@ -167,7 +167,7 @@ static void cleanup_card(struct net_device *dev)
 #ifndef MODULE
 struct net_device * __init ne_probe(int unit)
 {
-       struct net_device *dev = ____alloc_ei_netdev(0);
+       struct net_device *dev = alloc_ei_netdev();
        int err;
 
        if (!dev)
@@ -193,6 +193,22 @@ out:
 }
 #endif
 
+static const struct net_device_ops ne_netdev_ops = {
+       .ndo_open               = ne_open,
+       .ndo_stop               = ne_close,
+
+       .ndo_start_xmit         = ei_start_xmit,
+       .ndo_tx_timeout         = ei_tx_timeout,
+       .ndo_get_stats          = ei_get_stats,
+       .ndo_set_multicast_list = ei_set_multicast_list,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_set_mac_address    = eth_mac_addr,
+       .ndo_change_mtu         = eth_change_mtu,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       .ndo_poll_controller    = ei_poll,
+#endif
+};
+
 static int __init ne_probe1(struct net_device *dev, int ioaddr)
 {
        int i;
@@ -204,7 +220,6 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
        static unsigned version_printed;
        struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
        unsigned char bus_width;
-       DECLARE_MAC_BUF(mac);
 
        if (!request_region(ioaddr, NE_IO_EXTENT, DRV_NAME))
                return -EBUSY;
@@ -299,7 +314,7 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
 
        for(i = 0; i < ETHER_ADDR_LEN; i++)
                dev->dev_addr[i] = SA_prom[i];
-       printk(" %s\n", print_mac(mac, dev->dev_addr));
+       printk(" %pM\n", dev->dev_addr);
 
        printk("%s: %s found at %#x, using IRQ %d.\n",
                dev->name, name, ioaddr, dev->irq);
@@ -320,11 +335,9 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
        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 = __ei_poll;
-#endif
+
+       dev->netdev_ops = &ne_netdev_ops;
+
        __NS8390_init(dev, 0);
 
        ret = register_netdev(dev);
@@ -625,7 +638,7 @@ int init_module(void)
        int err;
 
        for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
-               struct net_device *dev = ____alloc_ei_netdev(0);
+               struct net_device *dev = alloc_ei_netdev();
                if (!dev)
                        break;
                if (io[this_dev]) {