[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-id: <alpine.LFD.1.10.0806261954290.2979@xanadu.home>
Date: Thu, 26 Jun 2008 19:54:46 -0400 (EDT)
From: Nicolas Pitre <nico@....org>
To: Eric Miao <eric.y.miao@...il.com>
Cc: linux-arm-kernel <linux-arm-kernel@...ts.arm.linux.org.uk>,
linux-netdev <netdev@...r.kernel.org>,
Magnus Damm <magnus.damm@...il.com>,
Eric Miao <eric.miao@...vell.com>
Subject: Re: [PATCH 04/10] smc91x: add SMC91X_NOWAIT flag to platform data
On Tue, 24 Jun 2008, Eric Miao wrote:
> From: Eric Miao <eric.miao@...vell.com>
>
> And also favors the usage of SMC91X_NOWAIT over the hardcoded SMC_NOWAIT
> by converting "nowait" (module parameter overridable) to platform flag.
>
> There are several possibilities:
>
> 1. platform data present - preferred and use as is
> 2. platform data absent - use "nowait", it can be:
> a. SMC_NOWAIT if defined
> b. default to 0 if SMC_NOWAIT isn't defined
> c. overriden by module parameter
>
> Signed-off-by: Eric Miao <eric.miao@...vell.com>
Acked-by: Nicolas Pitre <nico@....org>
> ---
> drivers/net/smc91x.c | 3 ++-
> include/linux/smc91x.h | 2 ++
> 2 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
> index b57ee44..caa0308 100644
> --- a/drivers/net/smc91x.c
> +++ b/drivers/net/smc91x.c
> @@ -279,7 +279,7 @@ static void smc_reset(struct net_device *dev)
> * can't handle it then there will be no recovery except for
> * a hard reset or power cycle
> */
> - if (nowait)
> + if (lp->cfg.flags & SMC91X_NOWAIT)
> cfg |= CONFIG_NO_WAIT;
>
> /*
> @@ -2142,6 +2142,7 @@ static int smc_drv_probe(struct platform_device *pdev)
> lp->cfg.flags |= (SMC_CAN_USE_8BIT) ? SMC91X_USE_8BIT : 0;
> lp->cfg.flags |= (SMC_CAN_USE_16BIT) ? SMC91X_USE_16BIT : 0;
> lp->cfg.flags |= (SMC_CAN_USE_32BIT) ? SMC91X_USE_32BIT : 0;
> + lp->cfg.flags |= (nowait) ? SMC91X_NOWAIT : 0;
> }
>
> ndev->dma = (unsigned char)-1;
> diff --git a/include/linux/smc91x.h b/include/linux/smc91x.h
> index fc7682f..90434db 100644
> --- a/include/linux/smc91x.h
> +++ b/include/linux/smc91x.h
> @@ -5,6 +5,8 @@
> #define SMC91X_USE_16BIT (1 << 1)
> #define SMC91X_USE_32BIT (1 << 2)
>
> +#define SMC91X_NOWAIT (1 << 3)
> +
> struct smc91x_platdata {
> unsigned long flags;
> };
> --
> 1.5.4.3
>
Nicolas
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists