[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1339572727.22704.314.camel@edumazet-glaptop>
Date: Wed, 13 Jun 2012 09:32:07 +0200
From: Eric Dumazet <eric.dumazet@...il.com>
To: Giuseppe CAVALLARO <peppe.cavallaro@...com>
Cc: netdev@...r.kernel.org, bhutchings@...arflare.com,
rayagond@...avyalabs.com, davem@...emloft.net,
yuvalmin@...adcom.com
Subject: Re: [net-next.git 2/4 (v2)] stmmac: do not use strict_strtoul but
kstrtoul
On Wed, 2012-06-13 at 09:17 +0200, Giuseppe CAVALLARO wrote:
> This patch replaces the obsolete strict_strtoul with kstrtoul.
>
> v2: also removed casting on kstrtoul.
>
> Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@...com>
> ---
> drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 +-
> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 67 +++++++++-----------
> 2 files changed, 31 insertions(+), 38 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
> index 6d07ba2..1d70f64 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
> @@ -88,7 +88,7 @@ struct stmmac_priv {
> int synopsys_id;
> };
>
> -extern int phyaddr;
> +extern unsigned long int phyaddr;
>
> extern int stmmac_mdio_unregister(struct net_device *ndev);
> extern int stmmac_mdio_register(struct net_device *ndev);
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index 8899e10..bd53003 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -80,39 +80,39 @@
>
> /* Module parameters */
> #define TX_TIMEO 5000 /* default 5 seconds */
> -static int watchdog = TX_TIMEO;
> -module_param(watchdog, int, S_IRUGO | S_IWUSR);
> +static unsigned long int watchdog = TX_TIMEO;
> +module_param(watchdog, ulong, S_IRUGO | S_IWUSR);
> MODULE_PARM_DESC(watchdog, "Transmit timeout in milliseconds");
>
It seems you missed the kstrtouint() / kstrtoint() functions....
--
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