From patchwork Fri Dec 8 02:37:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 845960 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="sjmYdDoB"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hWduo5Gw"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ytGjw6Z3Wz9rxm for ; Fri, 8 Dec 2017 13:38:12 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=STNEWtAXB/Ay8fS8AXFYbvxYkFCgxns1yxSzHw8Je68=; b=sjmYdDoBDxmxGI YdtVg7C6xIjAAi+V5gNW0fq1kFnKMwhX5IZb+AcrClEp5su0gdtDsFDTlz3z+2SZqnZNusCTQCtBl zP5EAhtFXVwesnhKfXdNar00UGZ00wV8hxt0JlCN6aRb4FnLvuICquL4O2ubM0UFw8SnbQRZUHWvJ OsdPtu9pxeLH5VZoqATxvv0v/JqCBCOipipeMkzR/ciwYGzm511/GBL+3O9RFw3y1FCybDK1OtgQi J7HeObu3VuGGpVd+74k/P3n9OARuQc3lF4uqCidQh3fxSiCseM7JTjmpHVXlnaMJ24xv9iKj0rp8+ MDFs2fLb/vFXsV4T453Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eN8YE-00059j-EF; Fri, 08 Dec 2017 02:38:10 +0000 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eN8Xo-0004kJ-VX for lede-dev@lists.infradead.org; Fri, 08 Dec 2017 02:37:48 +0000 Received: by mail-pf0-x244.google.com with SMTP id a90so6187437pfk.1 for ; Thu, 07 Dec 2017 18:37:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fWOyeLrQKVQ6azVecneJ2J12pCdLKgnw/DfChoSY1hs=; b=hWduo5Gwe8t6KFaSkkUTpHq2iQyci4P1ILL+PgAOAu7zUfONvrZ64Wu+MafM5oVHsd V664Gi7FO69wsFsVgeZDDtfwtEJOKtNsCMx+aIAttNsdgE03VQ6fVCRzGWQuytPkJbn7 /AIkDDeK2KkA0ferzLAmML3gFwvIj2HuvdUpiArgd8lNpSFrDOE2rfN+x/+BoC25E/2V wzfgJ+nvNetzQWIiS/y8PVOUS3N/zpy2QTq80LqbtAMfJQQsxHc0csdeSdRcEd1wpc2U lesg7j0sgE4smKTwv/NWw9JwT1mhAXQX2/X8JgLkKTlICKrTy6RwXu/CgMBzHOWvHCzE RXxw== 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:in-reply-to :references; bh=fWOyeLrQKVQ6azVecneJ2J12pCdLKgnw/DfChoSY1hs=; b=ZXjfoxvEQTmkKebp6/zUCieHf/u+dGaPWlajx+7Tb1oUIhe7mpml17MfgW3EEVVF2D AuuA1pzCa9o2VX9YNNAoc6TlSjipmsuRzmKNwpEHoMqYkYa7DhIntLdNX3a2zKbsY0U2 H91LdeFN87UOx/vWC89Ruzu7h8YpV/n4NnupuSJvuYoZNMMveP6kfOBcmKvNEkOxMa61 e9BsAHlkAK954ygSt7i6/FILgfAABlWXpELs0NfceTJa4oaEK0RJAmZmSxGEoYQG1C4p YnFTbS0/zsMPub2LTRunTcXwZj2mhHfd7PIghKiVnDqPzex2XpvfR5nQD00L8UiUileV Djow== X-Gm-Message-State: AKGB3mKMUMr/qiF6TGrejcBg1GWYS8Bdvr8qDRL0tPrg1lVpnkfs3O+/ fcPFDNy4FPM6EB0bkPovpa5PTwTB X-Google-Smtp-Source: AGs4zMbIl6cijpY4On/X9G64tEegWLYLLygn7LbXMpp+1lUjL2PARNRs7aVWUe1s7eQce8JoxKEYjQ== X-Received: by 10.84.129.46 with SMTP id 43mr3180658plb.1.1512700644961; Thu, 07 Dec 2017 18:37:24 -0800 (PST) Received: from DESKTOP-CEH0M93.lan ([2001:470:1f05:c3e:6ddd:19cc:fe85:6bad]) by smtp.gmail.com with ESMTPSA id j62sm11282750pfc.18.2017.12.07.18.37.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Dec 2017 18:37:24 -0800 (PST) From: Rosen Penev To: lede-dev@lists.infradead.org Date: Thu, 7 Dec 2017 18:37:14 -0800 Message-Id: <1512700637-47-4-git-send-email-rosenp@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512700637-47-1-git-send-email-rosenp@gmail.com> References: <1512700637-47-1-git-send-email-rosenp@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171207_183745_046643_CEE86CE5 X-CRM114-Status: UNSURE ( 8.94 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c00:0:0:0:244 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (rosenp[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [LEDE-DEV] [PATCH 4/7] ag71xx: Remove unnecessary goto statement. X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rosen Penev MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Tightens up the ag71xx_ring_alloc function and makes it easier to read. Signed-off-by: Rosen Penev --- .../drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c index ffbe646..7518352 100644 --- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c +++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c @@ -112,26 +112,17 @@ static void ag71xx_ring_free(struct ag71xx_ring *ring) static int ag71xx_ring_alloc(struct ag71xx_ring *ring) { int ring_size = BIT(ring->order); - int err; ring->descs_cpu = dma_alloc_coherent(NULL, ring_size * AG71XX_DESC_SIZE, &ring->descs_dma, GFP_ATOMIC); - if (!ring->descs_cpu) { - err = -ENOMEM; - goto err; - } - + if (!ring->descs_cpu) + return -ENOMEM; ring->buf = kzalloc(ring_size * sizeof(*ring->buf), GFP_KERNEL); - if (!ring->buf) { - err = -ENOMEM; - goto err; - } + if (!ring->buf) + return -ENOMEM; return 0; - -err: - return err; } static void ag71xx_ring_tx_clean(struct ag71xx *ag)