macmace, macsonic: cleanup

We check ether_type before registering the platform device in
arch/m68k/mac/config.c. Doing the same test again in the driver is
redundant so remove it.

Multiple probes should not happen since the conversion to platform devices,
so lose that test too.

Then macmace.c need not include macintosh.h, so remove that and irq.h and
include linux/interrupt.h explicitly.

Tested on PowerBook 520, Quadra 660av, LC 630.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/apple/macmace.c b/drivers/net/ethernet/apple/macmace.c
index 6cd3f86..7cf81bb 100644 (file)
--- a/drivers/net/ethernet/apple/macmace.c
+++ b/drivers/net/ethernet/apple/macmace.c
@@ -31,9 +31,8 @@
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 #include <linux/gfp.h>
+#include <linux/interrupt.h>
 #include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/macintosh.h>
 #include <asm/macints.h>
 #include <asm/mac_psc.h>
 #include <asm/page.h>
@@ -203,14 +202,8 @@ static int __devinit mace_probe(struct platform_device *pdev)
        unsigned char *addr;
        struct net_device *dev;
        unsigned char checksum = 0;
-       static int found = 0;
        int err;
 
-       if (found || macintosh_config->ether_type != MAC_ETHER_MACE)
-               return -ENODEV;
-
-       found = 1;      /* prevent 'finding' one on every device probe */
-
        dev = alloc_etherdev(PRIV_BYTES);
        if (!dev)
                return -ENOMEM;

diff --git a/drivers/net/ethernet/natsemi/macsonic.c b/drivers/net/ethernet/natsemi/macsonic.c
index 5c36948..a2eacbf 100644 (file)
--- a/drivers/net/ethernet/natsemi/macsonic.c
+++ b/drivers/net/ethernet/natsemi/macsonic.c
@@ -313,22 +313,13 @@ static void __devinit mac_onboard_sonic_ethernet_addr(struct net_device *dev)
 
 static int __devinit mac_onboard_sonic_probe(struct net_device *dev)
 {
-       /* Bwahahaha */
-       static int once_is_more_than_enough;
        struct sonic_local* lp = netdev_priv(dev);
        int sr;
        int commslot = 0;
 
-       if (once_is_more_than_enough)
-               return -ENODEV;
-       once_is_more_than_enough = 1;
-
        if (!MACH_IS_MAC)
                return -ENODEV;
 
-       if (macintosh_config->ether_type != MAC_ETHER_SONIC)
-               return -ENODEV;
-
        printk(KERN_INFO "Checking for internal Macintosh ethernet (SONIC).. ");
 
        /* Bogus probing, on the models which may or may not have