]> err.no Git - linux-2.6/commit
[NET] smc91x: remove "irq_flags" from "struct smc91x_platdata"
authorEric Miao <eric.miao@marvell.com>
Fri, 6 Jun 2008 09:13:02 +0000 (17:13 +0800)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 12 Jul 2008 20:52:40 +0000 (21:52 +0100)
commitd280eadc4fba0bf99fb1c3b60e8c5e007f7da02c
tree3545255c30bf5cfc61b9c86b1f7f7d6313395575
parent37d7035da5b1f184c610b038b376c0c647d8d72b
[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>
arch/sh/boards/renesas/migor/setup.c
drivers/net/smc91x.c
include/linux/smc91x.h