diff options
author | Eric Miao <eric.miao@marvell.com> | 2008-06-06 05:13:02 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-12 16:52:40 -0400 |
commit | d280eadc4fba0bf99fb1c3b60e8c5e007f7da02c (patch) | |
tree | 3545255c30bf5cfc61b9c86b1f7f7d6313395575 /include/linux | |
parent | 37d7035da5b1f184c610b038b376c0c647d8d72b (diff) |
[NET] smc91x: remove "irq_flags" from "struct smc91x_platdata"
IRQ trigger type can be specified in the IRQ resource definition by
IORESOURCE_IRQ_*, we need only one way to specify this.
This also fixes the following small issue:
To allow dynamic support for multiple platforms, when those relevant
macros are not defined for one specific platform, the default case
will be:
- SMC_DYNAMIC_BUS_CONFIG defined
- and SMC_IRQ_FLAGS = IRQF_TRIGGER_RISING
While if "irq_flags" is missing when defining the smc91x_platdata,
usually as follows:
static struct smc91x_platdata xxxx_smc91x_data = {
.flags = SMC91X_USE_XXBIT,
};
The lp->cfg.irq_flags will always be overriden by the above structure
(due to a memcpy), thus rendering lp->cfg.irq_flags to be "0" always.
(regardless of the default SMC_IRQ_FLAGS or IORESOURCE_IRQ_* flags)
Fixes this by forcing to use IORESOURCE_IRQ_* flags if present, and
make the only user of smc91x_platdata.irq_flags (renesas/migor) to
use IORESOURCE_IRQ_*.
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Acked-by: Nicolas Pitre <nico@cam.org>
Acked-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/smc91x.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/smc91x.h b/include/linux/smc91x.h index 8e0556b8781c..fc7682f04d89 100644 --- a/include/linux/smc91x.h +++ b/include/linux/smc91x.h | |||
@@ -7,7 +7,6 @@ | |||
7 | 7 | ||
8 | struct smc91x_platdata { | 8 | struct smc91x_platdata { |
9 | unsigned long flags; | 9 | unsigned long flags; |
10 | unsigned long irq_flags; /* IRQF_... */ | ||
11 | }; | 10 | }; |
12 | 11 | ||
13 | #endif /* __SMC91X_H__ */ | 12 | #endif /* __SMC91X_H__ */ |