Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752435AbdLLRu2 (ORCPT ); Tue, 12 Dec 2017 12:50:28 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:46567 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751688AbdLLRuS (ORCPT ); Tue, 12 Dec 2017 12:50:18 -0500 X-Google-Smtp-Source: ACJfBov9/1OATTHhgwISUJHzUsXkMA20EmY/LNmgohkR0bWZZp6PeXN7o8QWKvRULHUQfVklYBk8XA== Date: Tue, 12 Dec 2017 19:50:14 +0200 From: Ivan Khoronzhuk To: Grygorii Strashko Cc: netdev@vger.kernel.org, davem@davemloft.net, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 net-next] net: ethernet: ti: cpdma: correct error handling for chan create Message-ID: <20171212175012.GA27096@khorivan> Mail-Followup-To: Grygorii Strashko , netdev@vger.kernel.org, davem@davemloft.net, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org References: <1513096517-3905-1-git-send-email-ivan.khoronzhuk@linaro.org> <871f9995-3442-d07e-a36a-4353042bb860@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <871f9995-3442-d07e-a36a-4353042bb860@ti.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3428 Lines: 92 On Tue, Dec 12, 2017 at 11:08:51AM -0600, Grygorii Strashko wrote: > > > On 12/12/2017 10:35 AM, Ivan Khoronzhuk wrote: > > 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))) { > > So, logically WARN_ON() should be removed in davinci_emac.c also. Right? It doesn't have dev_err() duplicate, so not very. But would be better to replace them on dev_err() if no objection. > > > + 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; > > } > > > > > > -- > regards, > -grygorii -- Regards, Ivan Khoronzhuk