]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
DM9000: Remove DEFAULT_TRIGGER for request_irq() flags.
authorBen Dooks <ben-linux@fluff.org>
Tue, 24 Jun 2008 21:16:07 +0000 (22:16 +0100)
committerJeff Garzik <jgarzik@redhat.com>
Wed, 25 Jun 2008 02:58:36 +0000 (22:58 -0400)
Currently all but one user (AT91SAM9261EK) of the dm9000
driver passes their IRQ flags through the resources attached
to the platform device. This means we can remove the use
of DEFAULT_TRIGGER as the blackfin machines all seem to
have their triggers set properly.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/net/dm9000.c

index 92233400e6f9153e61663663d97d9b7b00b610d1..952e10d686ec2f7508e716d450b7d583f022c1f6 100644 (file)
@@ -54,9 +54,6 @@
 #define writesb        outsb
 #define writesw        outsw
 #define writesl        outsl
-#define DEFAULT_TRIGGER IRQF_TRIGGER_HIGH
-#else
-#define DEFAULT_TRIGGER (0)
 #endif
 
 /*
@@ -1014,11 +1011,9 @@ dm9000_open(struct net_device *dev)
        /* If there is no IRQ type specified, default to something that
         * may work, and tell the user that this is a problem */
 
-       if (irqflags == IRQF_TRIGGER_NONE) {
+       if (irqflags == IRQF_TRIGGER_NONE)
                dev_warn(db->dev, "WARNING: no IRQ resource flags set.\n");
-               irqflags = DEFAULT_TRIGGER;
-       }
-       
+
        irqflags |= IRQF_SHARED;
 
        if (request_irq(dev->irq, &dm9000_interrupt, irqflags, dev->name, dev))