diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-06-25 01:16:07 +0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-06-25 06:58:36 +0400 |
| commit | 6ff4ff06d2b6e4cfd4767ef03675cd3c7c70eaa0 (patch) | |
| tree | c4250df109721216ca52d1e701a02c67b7932e21 | |
| parent | 485ca22a10b3d3a4d156e170a541b8c3a5144f8c (diff) | |
| download | linux-6ff4ff06d2b6e4cfd4767ef03675cd3c7c70eaa0.tar.xz | |
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.c | 9 |
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 @@ #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)) |