aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-06-24 17:16:07 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-06-24 22:58:36 -0400
commit6ff4ff06d2b6e4cfd4767ef03675cd3c7c70eaa0 (patch)
treec4250df109721216ca52d1e701a02c67b7932e21
parent485ca22a10b3d3a4d156e170a541b8c3a5144f8c (diff)
DM9000: Remove DEFAULT_TRIGGER for request_irq() flags.
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>
-rw-r--r--drivers/net/dm9000.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 92233400e6f9..952e10d686ec 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -54,9 +54,6 @@
54#define writesb outsb 54#define writesb outsb
55#define writesw outsw 55#define writesw outsw
56#define writesl outsl 56#define writesl outsl
57#define DEFAULT_TRIGGER IRQF_TRIGGER_HIGH
58#else
59#define DEFAULT_TRIGGER (0)
60#endif 57#endif
61 58
62/* 59/*
@@ -1014,11 +1011,9 @@ dm9000_open(struct net_device *dev)
1014 /* If there is no IRQ type specified, default to something that 1011 /* If there is no IRQ type specified, default to something that
1015 * may work, and tell the user that this is a problem */ 1012 * may work, and tell the user that this is a problem */
1016 1013
1017 if (irqflags == IRQF_TRIGGER_NONE) { 1014 if (irqflags == IRQF_TRIGGER_NONE)
1018 dev_warn(db->dev, "WARNING: no IRQ resource flags set.\n"); 1015 dev_warn(db->dev, "WARNING: no IRQ resource flags set.\n");
1019 irqflags = DEFAULT_TRIGGER; 1016
1020 }
1021
1022 irqflags |= IRQF_SHARED; 1017 irqflags |= IRQF_SHARED;
1023 1018
1024 if (request_irq(dev->irq, &dm9000_interrupt, irqflags, dev->name, dev)) 1019 if (request_irq(dev->irq, &dm9000_interrupt, irqflags, dev->name, dev))