leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[NET] smc91x: remove "irq_flags" from "struct smc91x_platdata"

Browse Source 
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>
This commit is contained in:
Eric Miao 2008-06-06 17:13:02 +08:00 committed by Russell King
parent 37d7035da5
commit d280eadc4f
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/sh/boards/renesas/migor/setup.c
View File

@ -30,7 +30,6 @@
static struct smc91x_platdata smc91x_info = { static struct smc91x_platdata smc91x_info = {
.flags = SMC91X_USE_16BIT, .flags = SMC91X_USE_16BIT,
.irq_flags = IRQF_TRIGGER_HIGH,
}; };
static struct resource smc91x_eth_resources[] = { static struct resource smc91x_eth_resources[] = {
@ -42,7 +41,7 @@ static struct resource smc91x_eth_resources[] = {
}, },
[1] = { [1] = {
.start = 32, /* IRQ0 */ .start = 32, /* IRQ0 */
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
}, },
}; };

9
drivers/net/smc91x.c
View File

@ -2123,6 +2123,7 @@ static int smc_drv_probe(struct platform_device *pdev)
struct net_device *ndev; struct net_device *ndev;
struct resource *res, *ires; struct resource *res, *ires;
unsigned int __iomem *addr; unsigned int __iomem *addr;
unsigned long irq_flags = SMC_IRQ_FLAGS;
int ret; int ret;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs");
@ -2152,7 +2153,6 @@ static int smc_drv_probe(struct platform_device *pdev)
*/ */
lp = netdev_priv(ndev); lp = netdev_priv(ndev);
lp->cfg.irq_flags = SMC_IRQ_FLAGS;
#ifdef SMC_DYNAMIC_BUS_CONFIG #ifdef SMC_DYNAMIC_BUS_CONFIG
if (pd) if (pd)
@ -2177,8 +2177,9 @@ static int smc_drv_probe(struct platform_device *pdev)
} }
ndev->irq = ires->start; ndev->irq = ires->start;
if (SMC_IRQ_FLAGS == -1)
lp->cfg.irq_flags = ires->flags & IRQF_TRIGGER_MASK; if (ires->flags & IRQF_TRIGGER_MASK)
irq_flags = ires->flags & IRQF_TRIGGER_MASK;
ret = smc_request_attrib(pdev); ret = smc_request_attrib(pdev);
if (ret) if (ret)
@ -2205,7 +2206,7 @@ static int smc_drv_probe(struct platform_device *pdev)
} }
#endif #endif
ret = smc_probe(ndev, addr, lp->cfg.irq_flags); ret = smc_probe(ndev, addr, irq_flags);
if (ret != 0) if (ret != 0)
goto out_iounmap; goto out_iounmap;

1
include/linux/smc91x.h
View File

@ -7,7 +7,6 @@
struct smc91x_platdata { struct smc91x_platdata {
unsigned long flags; unsigned long flags;
unsigned long irq_flags; /* IRQF_... */
}; };
#endif /* __SMC91X_H__ */ #endif /* __SMC91X_H__ */