Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752296AbdLLRI7 (ORCPT ); Tue, 12 Dec 2017 12:08:59 -0500 Received: from fllnx210.ext.ti.com ([198.47.19.17]:15202 "EHLO fllnx210.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751625AbdLLRI5 (ORCPT ); Tue, 12 Dec 2017 12:08:57 -0500 Subject: Re: [PATCH v2 net-next] net: ethernet: ti: cpdma: correct error handling for chan create To: Ivan Khoronzhuk CC: , , , References: <1513096517-3905-1-git-send-email-ivan.khoronzhuk@linaro.org> From: Grygorii Strashko Message-ID: <871f9995-3442-d07e-a36a-4353042bb860@ti.com> Date: Tue, 12 Dec 2017 11:08:51 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <1513096517-3905-1-git-send-email-ivan.khoronzhuk@linaro.org> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [128.247.59.147] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3047 Lines: 83 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? > + 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