From patchwork Tue Dec 12 16:35:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 847547 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="GRvsyaAY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yx56G15Mrz9s81 for ; Wed, 13 Dec 2017 03:35:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752255AbdLLQfZ (ORCPT ); Tue, 12 Dec 2017 11:35:25 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:46633 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751612AbdLLQfX (ORCPT ); Tue, 12 Dec 2017 11:35:23 -0500 Received: by mail-lf0-f66.google.com with SMTP id r143so23866419lfe.13 for ; Tue, 12 Dec 2017 08:35:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=XQTY3luUsu6+w0yunoQeQDK3Fj7Rq+3g3uUqyAeeeUg=; b=GRvsyaAYHptpZtFugDy2XwZISGs4kDufiYpXuf70+a+22Bqmt6G7FQ51T10OfILJ47 erZY60MZ53DPhqxjIBweg+LPmVoBLTAUWtwdpxm3bbBugrAV/R9nO6bpKC4Ia30CDy9v yKBIbf6I/o/eJ3EoFVw8I0BJAKxWbpZkyluJA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=XQTY3luUsu6+w0yunoQeQDK3Fj7Rq+3g3uUqyAeeeUg=; b=eHJAbien3wT1yvnr1csJyC1SRocY+kVryGdSN41QwQy/gZjxvwYZDhQPEN7kd/neTj MMKRmaukOqmBx094mj/XoxlB8Nr+GE66kM8+09v8raFJwG9PjGm67QMpRzi6vMktuDAZ H3wYkcziR0itroQCDFBdj8+cJc/gPGxmu87N7+vlpr7pptLDgWhMOE4RySixVtmaYmLI ztOOw8Y1OyXioZhQv60QyxDsjZZ/SR65Ln6pgzlTycLgMY79C+P999qDMXBK84kf5lso FL1UIjg3giEZGbMyUIAZI0ijQoSG+xE1xdL7HrlUMB7Wisp8zFoUDLD1zx+MxwV5cWrO WzjA== X-Gm-Message-State: AKGB3mJZSSKfHTR7E5JEnAq73qTRppXRVtjDV2HsTqz8gmp9M6ECzvt2 Dn/NTWu6j+ZitQ4HUtXpUTWpxw== X-Google-Smtp-Source: ACJfBovKqe/xVcGESuyMQc5pTA+d0hAafe9UeAIqokEwefhBIMkDJyKo8iTBrDkjPqNPB+f3q9cYNA== X-Received: by 10.46.18.216 with SMTP id 85mr2241028ljs.100.1513096521880; Tue, 12 Dec 2017 08:35:21 -0800 (PST) Received: from khorivan.synapse.com (59-201-94-178.pool.ukrtel.net. [178.94.201.59]) by smtp.gmail.com with ESMTPSA id w62sm3369129lje.59.2017.12.12.08.35.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Dec 2017 08:35:20 -0800 (PST) From: Ivan Khoronzhuk To: grygorii.strashko@ti.com Cc: netdev@vger.kernel.org, davem@davemloft.net, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, Ivan Khoronzhuk Subject: [PATCH v2 net-next] net: ethernet: ti: cpdma: correct error handling for chan create Date: Tue, 12 Dec 2017 18:35:17 +0200 Message-Id: <1513096517-3905-1-git-send-email-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It's not correct to return NULL when that is actually an error and function returns errors in any other wrong case. In the same time, the cpsw driver and davinci emac doesn't check error case while creating channel and it can miss actual error. Also remove WARNs duplicated dev_err msgs. Signed-off-by: Ivan Khoronzhuk --- drivers/net/ethernet/ti/cpsw.c | 12 +++++++++--- drivers/net/ethernet/ti/davinci_cpdma.c | 2 +- drivers/net/ethernet/ti/davinci_emac.c | 9 +++++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index a60a378..3c85a08 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -3065,10 +3065,16 @@ static int cpsw_probe(struct platform_device *pdev) } cpsw->txv[0].ch = cpdma_chan_create(cpsw->dma, 0, cpsw_tx_handler, 0); + if (IS_ERR(cpsw->txv[0].ch)) { + dev_err(priv->dev, "error initializing tx dma channel\n"); + ret = PTR_ERR(cpsw->txv[0].ch); + goto clean_dma_ret; + } + cpsw->rxv[0].ch = cpdma_chan_create(cpsw->dma, 0, cpsw_rx_handler, 1); - if (WARN_ON(!cpsw->rxv[0].ch || !cpsw->txv[0].ch)) { - dev_err(priv->dev, "error initializing dma channels\n"); - ret = -ENOMEM; + if (IS_ERR(cpsw->rxv[0].ch)) { + dev_err(priv->dev, "error initializing rx dma channel\n"); + ret = PTR_ERR(cpsw->rxv[0].ch); goto clean_dma_ret; } diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c index e4d6edf..6f9173f 100644 --- a/drivers/net/ethernet/ti/davinci_cpdma.c +++ b/drivers/net/ethernet/ti/davinci_cpdma.c @@ -893,7 +893,7 @@ struct cpdma_chan *cpdma_chan_create(struct cpdma_ctlr *ctlr, int chan_num, chan_num = rx_type ? rx_chan_num(chan_num) : tx_chan_num(chan_num); if (__chan_linear(chan_num) >= ctlr->num_chan) - return NULL; + return ERR_PTR(-EINVAL); chan = devm_kzalloc(ctlr->dev, sizeof(*chan), GFP_KERNEL); if (!chan) diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c index f58c0c6..3d4af64 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c @@ -1870,10 +1870,15 @@ static int davinci_emac_probe(struct platform_device *pdev) priv->txchan = cpdma_chan_create(priv->dma, EMAC_DEF_TX_CH, emac_tx_handler, 0); + if (WARN_ON(IS_ERR(priv->txchan))) { + rc = PTR_ERR(priv->txchan); + goto no_cpdma_chan; + } + priv->rxchan = cpdma_chan_create(priv->dma, EMAC_DEF_RX_CH, emac_rx_handler, 1); - if (WARN_ON(!priv->txchan || !priv->rxchan)) { - rc = -ENOMEM; + if (WARN_ON(IS_ERR(priv->rxchan))) { + rc = PTR_ERR(priv->rxchan); goto no_cpdma_chan; }