Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753517Ab2JCUQt (ORCPT <rfc822;w@1wt.eu>);
	Wed, 3 Oct 2012 16:16:49 -0400
Received: from mail-we0-f174.google.com ([74.125.82.174]:45282 "EHLO
	mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753098Ab2JCUQr (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 3 Oct 2012 16:16:47 -0400
MIME-Version: 1.0
In-Reply-To: <1349281090-10013-1-git-send-email-peter.senna@gmail.com>
References: <1349281090-10013-1-git-send-email-peter.senna@gmail.com>
Date: Wed, 3 Oct 2012 13:16:45 -0700
Message-ID: <CAP6odjgz_pspe-P-cp08XhV-7=Ubvsg6=wQXMODRJZWgK15ksw@mail.gmail.com>
Subject: Re: [PATCH 1/20] drivers/net/ethernet/dec/tulip/dmfe.c: fix error
 return code
From: Grant Grundler <grantgrundler@gmail.com>
To: Peter Senna Tschudin <peter.senna@gmail.com>
Cc: Grant Grundler <grundler@parisc-linux.org>,
        kernel-janitors@vger.kernel.org, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
Content-Type: text/plain; charset=ISO-8859-1
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2609
Lines: 83

On Wed, Oct 3, 2012 at 9:17 AM, Peter Senna Tschudin
<peter.senna@gmail.com> wrote:
> From: Peter Senna Tschudin <peter.senna@gmail.com>
>
> Convert a nonnegative error return code to a negative one, as returned
> elsewhere in the function.
>
> A simplified version of the semantic match that finds this problem is as
> follows: (http://coccinelle.lip6.fr/)
>
> // <smpl>
> (
> if@p1 (\(ret < 0\|ret != 0\))
>  { ... return ret; }
> |
> ret@p1 = 0
> )
> ... when != ret = e1
>     when != &ret
> *if(...)
> {
>   ... when != ret = e2
>       when forall
>  return ret;
> }
> // </smpl>
>
> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>

Thanks! Looks good to me.

Acked-by: Grant Grundler <grundler@parisc-linux.org>

cheers,
grant

>
> ---
>  drivers/net/ethernet/dec/tulip/dmfe.c |   12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c
> index 4d6fe60..d23755e 100644
> --- a/drivers/net/ethernet/dec/tulip/dmfe.c
> +++ b/drivers/net/ethernet/dec/tulip/dmfe.c
> @@ -446,13 +446,17 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
>         /* Allocate Tx/Rx descriptor memory */
>         db->desc_pool_ptr = pci_alloc_consistent(pdev, sizeof(struct tx_desc) *
>                         DESC_ALL_CNT + 0x20, &db->desc_pool_dma_ptr);
> -       if (!db->desc_pool_ptr)
> +       if (!db->desc_pool_ptr) {
> +               err = -ENOMEM;
>                 goto err_out_res;
> +       }
>
>         db->buf_pool_ptr = pci_alloc_consistent(pdev, TX_BUF_ALLOC *
>                         TX_DESC_CNT + 4, &db->buf_pool_dma_ptr);
> -       if (!db->buf_pool_ptr)
> +       if (!db->buf_pool_ptr) {
> +               err = -ENOMEM;
>                 goto err_out_free_desc;
> +       }
>
>         db->first_tx_desc = (struct tx_desc *) db->desc_pool_ptr;
>         db->first_tx_desc_dma = db->desc_pool_dma_ptr;
> @@ -462,8 +466,10 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
>         db->chip_id = ent->driver_data;
>         /* IO type range. */
>         db->ioaddr = pci_iomap(pdev, 0, 0);
> -       if (!db->ioaddr)
> +       if (!db->ioaddr) {
> +               err = -ENOMEM;
>                 goto err_out_free_buf;
> +       }
>
>         db->chip_revision = pdev->revision;
>         db->wol_mode = 0;
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/