netdev: bfin_mac: use promiscuous flag for promiscuous mode

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

diff --git a/drivers/net/hp.c b/drivers/net/hp.c
index 3669194..86ececd 100644 (file)
--- a/drivers/net/hp.c
+++ b/drivers/net/hp.c
@@ -59,8 +59,6 @@ static unsigned int hppclan_portlist[] __initdata =
 
 static int hp_probe1(struct net_device *dev, int ioaddr);
 
-static int hp_open(struct net_device *dev);
-static int hp_close(struct net_device *dev);
 static void hp_reset_8390(struct net_device *dev);
 static void hp_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,
                                        int ring_page);
@@ -198,11 +196,7 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr)
 
        /* Set the base address to point to the NIC, not the "real" base! */
        dev->base_addr = ioaddr + NIC_OFFSET;
-       dev->open = &hp_open;
-       dev->stop = &hp_close;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       dev->poll_controller = eip_poll;
-#endif
+       dev->netdev_ops = &eip_netdev_ops;
 
        ei_status.name = name;
        ei_status.word16 = wordmode;
@@ -227,20 +221,6 @@ out:
        return retval;
 }
 
-static int
-hp_open(struct net_device *dev)
-{
-       eip_open(dev);
-       return 0;
-}
-
-static int
-hp_close(struct net_device *dev)
-{
-       eip_close(dev);
-       return 0;
-}
-
 static void
 hp_reset_8390(struct net_device *dev)
 {
@@ -260,7 +240,6 @@ hp_reset_8390(struct net_device *dev)
                printk("%s: hp_reset_8390() did not complete.\n", dev->name);
 
        if (ei_debug > 1) printk("8390 reset done (%ld).", jiffies);
-       return;
 }
 
 static void
@@ -380,7 +359,6 @@ hp_block_output(struct net_device *dev, int count,
                           dev->name, (start_page << 8) + count, addr);
        }
        outb_p(saved_config & (~HP_DATAON), nic_base - NIC_OFFSET + HP_CONFIGURE);
-       return;
 }
 
 /* This function resets the ethercard if something screws up. */
@@ -391,7 +369,6 @@ hp_init_card(struct net_device *dev)
        NS8390p_init(dev, 0);
        outb_p(irqmap[irq&0x0f] | HP_RUN,
                   dev->base_addr - NIC_OFFSET + HP_CONFIGURE);
-       return;
 }
 
 #ifdef MODULE