[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <56C5C167.7080205@cogentembedded.com>
Date: Thu, 18 Feb 2016 16:04:39 +0300
From: Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
To: Steve Wise <swise@...ngridcomputing.com>, netdev@...r.kernel.org
Cc: santosh@...lsio.com, davem@...emloft.net, hariprasad@...lsio.com
Subject: Re: [PATCH 1/1] cxgb3: fix up vpd strings for kstrto*()
Hello.
On 2/17/2016 11:36 PM, Steve Wise wrote:
> The vpd strings are left justified, in a fixed length array, with possible
> trailing white space and no NUL. So fix them up before calling kstrto*().
>
> This is a recent regression which causes cxgb3 to fail to load.
>
> Fixes:e72c932('cxgb3: Convert simple_strtoul to kstrtox')
>
> Signed-off-by: Steve Wise <swise@...ngridcomputing.com>
> ---
> drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 32 +++++++++++++++++++++++-------
> 1 file changed, 25 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c
> index ee04caa..bfd4a7f 100644
> --- a/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c
> +++ b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c
> @@ -681,6 +681,24 @@ int t3_seeprom_wp(struct adapter *adapter, int enable)
> return t3_seeprom_write(adapter, EEPROM_STAT_ADDR, enable ? 0xc : 0);
> }
>
> +static int vpdstrtouint(char *s, int len, unsigned int base, unsigned int *val)
> +{
> + char tok[len+1];
The Linus coding style generally requires the operators to be surrounded
by spaces.
> +
> + memcpy(tok, s, len);
> + tok[len] = 0;
> + return kstrtouint(strim(tok), base, val);
> +}
> +
> +static int vpdstrtou16(char *s, int len, unsigned int base, u16 *val)
> +{
> + char tok[len+1];
Likewise.
> +
> + memcpy(tok, s, len);
> + tok[len] = 0;
> + return kstrtou16(strim(tok), base, val);
> +}
> +
> /**
> * get_vpd_params - read VPD parameters from VPD EEPROM
> * @adapter: adapter to read
[...]
MBR, Sergei
Powered by blists - more mailing lists