From patchwork Tue Dec 12 21:06:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 10108267 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 468A3602C2 for ; Tue, 12 Dec 2017 21:06:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38BDB20408 for ; Tue, 12 Dec 2017 21:06:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C2DE28EE1; Tue, 12 Dec 2017 21:06:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94D2A20408 for ; Tue, 12 Dec 2017 21:06:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752452AbdLLVGm (ORCPT ); Tue, 12 Dec 2017 16:06:42 -0500 Received: from mail-lf0-f68.google.com ([209.85.215.68]:45158 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752425AbdLLVGl (ORCPT ); Tue, 12 Dec 2017 16:06:41 -0500 Received: by mail-lf0-f68.google.com with SMTP id f13so230662lff.12 for ; Tue, 12 Dec 2017 13:06:41 -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=mgrNmuyIvINhrrTLfBcnNuH0Yl2bgwqvmCfFhOfP+M4=; b=fo6YJs44naBo6/vws5PJgcT/kkYRXbjyS8hBZOkHYnJ04efC3AItg0Un1IqkV1tS/c oysxqMQnCZBUbbp3LbzZohIthYSnRdfcRn8gnLYL5fVsqqBjnwgc35KN3IHn2BW+inAr 95MxdDepXg/3ZkqPzf6s7AWAupoyuvCjhblFc= 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=mgrNmuyIvINhrrTLfBcnNuH0Yl2bgwqvmCfFhOfP+M4=; b=jJaKODUv0cinrTSUciHDybqjfBAaWq91RW0VEmSRPRXaWaQUeUH24lMHmwFqou/hit PPNdT9DMnQvMOPCzDovFWWQ7pj1LVvtpf56DSGHK/T+yL86WxhYKs+yif5wQ39YXVdOH xFeTIgKWil9NBVZHiGL9VfVw7xnmBSYsB/8n4/C50iPyqnUSkn9K8oqO7pW8VwZcXDvy rLD8QFtm8W7+1Ds+GW+74D7RknfkXpMTjk0u5zPhFcvSHqMmrG63t6N5Bh9Aiuy5TbdD K3toAX2v9Xk6mz1qvs0O/Y5TaW9L2Q6T4MNs62GQBYatcXuL8ve2qmFDg8IJu33XvCkJ 7vvQ== X-Gm-Message-State: AKGB3mKwdEZFQ+Kq2Bg60fCREkZtdH9CmgZStjRsAb82UP9tEvnSgl3h 34kvlzB6R1gJPcWEyWCXKMQtJg== X-Google-Smtp-Source: ACJfBoubLUqGp+qeT6qzoIypuupKnW+ME/zWeP8InYeVzASBJxKrFbQvAkpC1wNUGaV3Jes9SAhpSQ== X-Received: by 10.25.18.36 with SMTP id h36mr104197lfi.75.1513112800211; Tue, 12 Dec 2017 13:06:40 -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 r66sm12887lfe.48.2017.12.12.13.06.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Dec 2017 13:06:39 -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 v3 net-next] net: ethernet: ti: cpdma: correct error handling for chan create Date: Tue, 12 Dec 2017 23:06:35 +0200 Message-Id: <1513112795-20045-1-git-send-email-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 replacing them on dev_err msgs. Signed-off-by: Ivan Khoronzhuk Reviewed-by: Grygorii Strashko --- drivers/net/ethernet/ti/cpsw.c | 12 +++++++++--- drivers/net/ethernet/ti/davinci_cpdma.c | 2 +- drivers/net/ethernet/ti/davinci_emac.c | 11 +++++++++-- 3 files changed, 19 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..abceea8 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c @@ -1870,10 +1870,17 @@ 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 (IS_ERR(priv->txchan)) { + dev_err(&pdev->dev, "error initializing tx dma channel\n"); + 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 (IS_ERR(priv->rxchan)) { + dev_err(&pdev->dev, "error initializing rx dma channel\n"); + rc = PTR_ERR(priv->rxchan); goto no_cpdma_chan; }