From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Pitre Subject: Re: [PATCH 02/10] smc91x: remove "irq_flags" from "struct smc91x_platdata" Date: Thu, 26 Jun 2008 19:52:57 -0400 (EDT) Message-ID: References: <1214300867-15495-3-git-send-email-eric.y.miao@gmail.com> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Content-Transfer-Encoding: 7BIT Cc: linux-arm-kernel , linux-netdev , Magnus Damm , Eric Miao To: Eric Miao Return-path: Received: from relais.videotron.ca ([24.201.245.36]:25153 "EHLO relais.videotron.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751705AbYFZXw5 (ORCPT ); Thu, 26 Jun 2008 19:52:57 -0400 Received: from xanadu.home ([66.131.194.97]) by VL-MO-MR002.ip.videotron.ca (Sun Java(tm) System Messaging Server 6.3-4.01 (built Aug 3 2007; 32bit)) with ESMTP id <0K3300GEHH09UFC0@VL-MO-MR002.ip.videotron.ca> for netdev@vger.kernel.org; Thu, 26 Jun 2008 19:52:57 -0400 (EDT) In-reply-to: <1214300867-15495-3-git-send-email-eric.y.miao@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: On Tue, 24 Jun 2008, Eric Miao wrote: > From: Eric Miao > > 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 Acked-by: Nicolas Pitre > --- > arch/sh/boards/renesas/migor/setup.c | 3 +-- > drivers/net/smc91x.c | 9 +++++---- > include/linux/smc91x.h | 1 - > 3 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/arch/sh/boards/renesas/migor/setup.c b/arch/sh/boards/renesas/migor/setup.c > index 01af442..963c993 100644 > --- a/arch/sh/boards/renesas/migor/setup.c > +++ b/arch/sh/boards/renesas/migor/setup.c > @@ -30,7 +30,6 @@ > > static struct smc91x_platdata smc91x_info = { > .flags = SMC91X_USE_16BIT, > - .irq_flags = IRQF_TRIGGER_HIGH, > }; > > static struct resource smc91x_eth_resources[] = { > @@ -42,7 +41,7 @@ static struct resource smc91x_eth_resources[] = { > }, > [1] = { > .start = 32, /* IRQ0 */ > - .flags = IORESOURCE_IRQ, > + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, > }, > }; > > diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c > index d471308..70a19ad 100644 > --- a/drivers/net/smc91x.c > +++ b/drivers/net/smc91x.c > @@ -2105,6 +2105,7 @@ static int smc_drv_probe(struct platform_device *pdev) > struct net_device *ndev; > struct resource *res, *ires; > unsigned int __iomem *addr; > + unsigned long irq_flags = SMC_IRQ_FLAGS; > int ret; > > res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs"); > @@ -2134,7 +2135,6 @@ static int smc_drv_probe(struct platform_device *pdev) > */ > > lp = netdev_priv(ndev); > - lp->cfg.irq_flags = SMC_IRQ_FLAGS; > > #ifdef SMC_DYNAMIC_BUS_CONFIG > if (pd) > @@ -2159,8 +2159,9 @@ static int smc_drv_probe(struct platform_device *pdev) > } > > 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); > if (ret) > @@ -2187,7 +2188,7 @@ static int smc_drv_probe(struct platform_device *pdev) > } > #endif > > - ret = smc_probe(ndev, addr, lp->cfg.irq_flags); > + ret = smc_probe(ndev, addr, irq_flags); > if (ret != 0) > goto out_iounmap; > > diff --git a/include/linux/smc91x.h b/include/linux/smc91x.h > index 8e0556b..fc7682f 100644 > --- a/include/linux/smc91x.h > +++ b/include/linux/smc91x.h > @@ -7,7 +7,6 @@ > > struct smc91x_platdata { > unsigned long flags; > - unsigned long irq_flags; /* IRQF_... */ > }; > > #endif /* __SMC91X_H__ */ > -- > 1.5.4.3 > Nicolas