From patchwork Wed Dec 6 14:54:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 10096189 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 3941D60329 for ; Wed, 6 Dec 2017 14:54:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2BB5D2999C for ; Wed, 6 Dec 2017 14:54:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 20A10299C7; Wed, 6 Dec 2017 14:54:18 +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 BA3102999C for ; Wed, 6 Dec 2017 14:54:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752457AbdLFOyP (ORCPT ); Wed, 6 Dec 2017 09:54:15 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:42591 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752379AbdLFOyO (ORCPT ); Wed, 6 Dec 2017 09:54:14 -0500 Received: by mail-lf0-f66.google.com with SMTP id i2so4528492lfe.9 for ; Wed, 06 Dec 2017 06:54:13 -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=wsA7oX04uA4JIkz9IRMou7acXyI/ZmCqwgeicWBWitw=; b=ZK+V9TnXL2jpRuzksl4t5vYNc55VCiG9ptuK2GKFeRa5qivA9HIg15OfVpfILZWCc/ YpF9uvr8+28cewPxU8bvVK6oKwo2WPNJ7kpY207bGFv052EynxrOxycr3MmPI+konnhf Y1Blz1awQ9vTzwaPEqZvxg5LRXWnVu2YjlJOI= 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=wsA7oX04uA4JIkz9IRMou7acXyI/ZmCqwgeicWBWitw=; b=UIqipW9PY9aam2lVg+KaoBcZnAFeqZl0+5ZkZ+T0jj9oLUh9Qk5WSl+nj8jV5MZqHc 7oMXq6vqDvjj8/hTSptPdrAOdPDa4tgf8uCpPsZnxopDZuAUpfNtflmNC3KQLBZHiHEg VyDj1V3xucJ+LwPsKyGYjzDjKh16WSdU8qXnwP5i2tnapPoNGqZwPaFKshhqwOx7OupQ Y5bOkJ/NX9BkkR7kufjTEWtBeqIIxMrQtr2sS+OA0eJMIIzVS8CMThi8eisGtQtUGRzF qnVLoom08GIMeyZAeKtZ9X1Viyt2Q4Mc5n67w4p8vN6sx+9wNcqZf7JrX5z03uVy7WKG WaKw== X-Gm-Message-State: AKGB3mIpFaf96npybn59rfSd2+rpl1eHV2wZq9sWeFWMnx5xOVl1stdM kldykKuVmRpxCklGPL1Rk8VFtQ== X-Google-Smtp-Source: AGs4zMboUwHvs3gy9JoyTEHhzY1zyHnR1kGvVThIDFO8eSd3URzw6ddMRwK9V+1TiNdTt87WDrMMdA== X-Received: by 10.25.80.93 with SMTP id z29mr1361786lfj.9.1512572052957; Wed, 06 Dec 2017 06:54:12 -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 n36sm538037lfi.78.2017.12.06.06.54.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Dec 2017 06:54:12 -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 net-next] net: ethernet: ti: cpdma: correct error handling for chan create Date: Wed, 6 Dec 2017 16:54:09 +0200 Message-Id: <1512572050-13442-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. Correct this mess. 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..ee58f48 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 (WARN_ON(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 (WARN_ON(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 dbe9167..a9fab42 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; }