From patchwork Fri Dec 4 14:26:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 552721 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D729C14029E for ; Sat, 5 Dec 2015 01:27:12 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Hhv/34fW; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752187AbbLDO0z (ORCPT ); Fri, 4 Dec 2015 09:26:55 -0500 Received: from mail-wm0-f50.google.com ([74.125.82.50]:36727 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751179AbbLDO0x (ORCPT ); Fri, 4 Dec 2015 09:26:53 -0500 Received: by wmww144 with SMTP id w144so64023392wmw.1; Fri, 04 Dec 2015 06:26:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=Fb/CZccrJLKPJ9Rjc9gh++LEHSnB0wfRXChBxD9miac=; b=Hhv/34fWbLzuJ/NNX8kq9CZgtkT5UM2TH0Q1mQz8K/TMOcaa9M9XVpz+K1m6AbrAF2 Vck9IJLWpxH/Kpwe+ijnsv0jQ/soCkXO0luXCjRav17VsC7TIEDzTP50wBGKroDZfIoN tC2Ze30VXy1i80rWDof47uIdXwAaKfLr6JRed92xLX8fMFFaLQbPDEBNDce4PksD8uMh A7SRMi4ZrcH2eeD5PY5XI8ZlZyWRfNlL09jlfwHpJ8xy3k1wsCtq7scg4xtlDZUZKh16 AGkH0HYfUcCQVPb8ZP9IuN5jS8WjAgd66guYaqRgqyKGAgL1T+ZEPhBsP0PxVNCgX0hC 6nUQ== X-Received: by 10.194.79.227 with SMTP id m3mr18092465wjx.123.1449239212484; Fri, 04 Dec 2015 06:26:52 -0800 (PST) Received: from Red.local (ANice-651-1-254-254.w86-205.abo.wanadoo.fr. [86.205.38.254]) by smtp.googlemail.com with ESMTPSA id pc2sm8162103wjb.11.2015.12.04.06.26.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Dec 2015 06:26:51 -0800 (PST) From: LABBE Corentin To: santosh@chelsio.com Cc: LABBE Corentin , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH] cxgb3: Convert simple_strtoul to kstrtox Date: Fri, 4 Dec 2015 15:26:40 +0100 Message-Id: <1449239201-879-1-git-send-email-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.4.10 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org the simple_strtoul function is obsolete. This patch replace it by kstrtox. Signed-off-by: LABBE Corentin --- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 10 ++++----- drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 28 ++++++++++++++++++------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c index 8f7aa53..6637073 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c @@ -701,15 +701,14 @@ static ssize_t attr_store(struct device *d, ssize_t(*set) (struct net_device *, unsigned int), unsigned int min_val, unsigned int max_val) { - char *endp; ssize_t ret; unsigned int val; if (!capable(CAP_NET_ADMIN)) return -EPERM; - val = simple_strtoul(buf, &endp, 0); - if (endp == buf || val < min_val || val > max_val) + ret = kstrtouint(buf, 0, &val); + if (ret || val < min_val || val > max_val) return -EINVAL; rtnl_lock(); @@ -829,14 +828,13 @@ static ssize_t tm_attr_store(struct device *d, struct port_info *pi = netdev_priv(to_net_dev(d)); struct adapter *adap = pi->adapter; unsigned int val; - char *endp; ssize_t ret; if (!capable(CAP_NET_ADMIN)) return -EPERM; - val = simple_strtoul(buf, &endp, 0); - if (endp == buf || val > 10000000) + ret = kstrtouint(buf, 0, &val); + if (ret || val > 10000000) return -EINVAL; rtnl_lock(); diff --git a/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c index a22768c..ee04caa 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c +++ b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c @@ -709,11 +709,21 @@ static int get_vpd_params(struct adapter *adapter, struct vpd_params *p) return ret; } - p->cclk = simple_strtoul(vpd.cclk_data, NULL, 10); - p->mclk = simple_strtoul(vpd.mclk_data, NULL, 10); - p->uclk = simple_strtoul(vpd.uclk_data, NULL, 10); - p->mdc = simple_strtoul(vpd.mdc_data, NULL, 10); - p->mem_timing = simple_strtoul(vpd.mt_data, NULL, 10); + ret = kstrtouint(vpd.cclk_data, 10, &p->cclk); + if (ret) + return ret; + ret = kstrtouint(vpd.mclk_data, 10, &p->mclk); + if (ret) + return ret; + ret = kstrtouint(vpd.uclk_data, 10, &p->uclk); + if (ret) + return ret; + ret = kstrtouint(vpd.mdc_data, 10, &p->mdc); + if (ret) + return ret; + ret = kstrtouint(vpd.mt_data, 10, &p->mem_timing); + if (ret) + return ret; memcpy(p->sn, vpd.sn_data, SERNUM_LEN); /* Old eeproms didn't have port information */ @@ -723,8 +733,12 @@ static int get_vpd_params(struct adapter *adapter, struct vpd_params *p) } else { p->port_type[0] = hex_to_bin(vpd.port0_data[0]); p->port_type[1] = hex_to_bin(vpd.port1_data[0]); - p->xauicfg[0] = simple_strtoul(vpd.xaui0cfg_data, NULL, 16); - p->xauicfg[1] = simple_strtoul(vpd.xaui1cfg_data, NULL, 16); + ret = kstrtou16(vpd.xaui0cfg_data, 16, &p->xauicfg[0]); + if (ret) + return ret; + ret = kstrtou16(vpd.xaui1cfg_data, 16, &p->xauicfg[1]); + if (ret) + return ret; } ret = hex2bin(p->eth_base, vpd.na_data, 6);