From patchwork Tue Jan 14 23:46:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 3488941 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EF2AC9F169 for ; Tue, 14 Jan 2014 23:48:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 365B22021B for ; Tue, 14 Jan 2014 23:48:19 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 385D2201F7 for ; Tue, 14 Jan 2014 23:48:18 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W3Dhi-0001Ua-N8; Tue, 14 Jan 2014 23:47:30 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W3DhY-0004cz-Mo; Tue, 14 Jan 2014 23:47:20 +0000 Received: from [2a01:e35:139b:9f90:221:70ff:fe55:8f78] (helo=smtp.natisbad.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W3DhV-0004bl-O9 for linux-arm-kernel@lists.infradead.org; Tue, 14 Jan 2014 23:47:18 +0000 Received: by smtp.natisbad.org (Postfix, from userid 5001) id B9A7F2C0CB9; Wed, 15 Jan 2014 00:46:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1389743215; bh=a5oDH7+W7OqI5/sEg4s2Q0YClStOaH2e1Vq6b3lbzIA=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=DJOq7lOFRT1EXzQj0QPdYgSrpIOhKA0qdoqzoDNwq3vzlXr736qnl4ppal1W2YGCd qsi+vvw8mLIeHATKghTzZSGp0e0oqJdlj4JM5md6fv9MENIH0IlweFqj7rxn6u0ObP Otge/cJBR4VoHXx8FwPv1vWkfoSFton6C4+T3RFM= X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from small (localhost [127.0.0.1]) by smtp.natisbad.org (Postfix) with ESMTP id 028692C07F4; Wed, 15 Jan 2014 00:46:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1389743213; bh=a5oDH7+W7OqI5/sEg4s2Q0YClStOaH2e1Vq6b3lbzIA=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=I+hv7FXOD6p7hU/VXtVUAh71ZWhm+AkiqzdPOYZyyxncdncDkZU3/pgexIEVzAQYg p+6g4ncqPDBHv9h+zEaej2bRMSbv1Y6iR4GYNmCm3ic+D45RGJMq76qlzs8kZzYoBM ZaMImTJZz+C2+YdxB4o+0FyxXP5L+NHzi2EdZtGw= X-Hashcash: 1:20:140114:davem@davemloft.net::091HyBLYWef2B+Z8:0000000000000000000000000000000000000000001ihf X-Hashcash: 1:20:140114:w@1wt.eu::XZCs8hdfe25+uW/U:0000000001NOs X-Hashcash: 1:20:140114:thomas.petazzoni@free-electrons.com::XLCsZLOgTsiF6A5u:000000000000000000000000008/XU X-Hashcash: 1:20:140114:netdev@vger.kernel.org::6762LZwZeo774zGZ:0000000000000000000000000000000000000004Ma8 X-Hashcash: 1:20:140114:linux-arm-kernel@lists.infradead.org::XdytKa83DP+A71Gd:00000000000000000000000001UaX From: Arnaud Ebalard To: David Miller , Willy Tarreau , Thomas Petazzoni Subject: [PATCH net-next 2/2] net: mvneta: make mvneta_txq_done() return void In-Reply-To: References: Message-Id: <1e35971f3ee9f4d120bff5fe98179160998ea0fa.1389742334.git.arno@natisbad.org> Date: Wed, 15 Jan 2014 00:46:52 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140114_184717_983197_8475F073 X-CRM114-Status: GOOD ( 13.00 ) X-Spam-Score: -1.2 (-) Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The function return parameter is not used in mvneta_tx_done_gbe(), where the function is called. This patch makes the function return void. Signed-off-by: Arnaud Ebalard Reviewed-by: Willy Tarreau --- drivers/net/ethernet/marvell/mvneta.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 8c5150124b5e..f418f4f20f94 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -1314,15 +1314,16 @@ static void mvneta_txq_bufs_free(struct mvneta_port *pp, } /* Handle end of transmission */ -static int mvneta_txq_done(struct mvneta_port *pp, +static void mvneta_txq_done(struct mvneta_port *pp, struct mvneta_tx_queue *txq) { struct netdev_queue *nq = netdev_get_tx_queue(pp->dev, txq->id); int tx_done; tx_done = mvneta_txq_sent_desc_proc(pp, txq); - if (tx_done == 0) - return tx_done; + if (!tx_done) + return; + mvneta_txq_bufs_free(pp, txq, tx_done); txq->count -= tx_done; @@ -1331,8 +1332,6 @@ static int mvneta_txq_done(struct mvneta_port *pp, if (txq->size - txq->count >= MAX_SKB_FRAGS + 1) netif_tx_wake_queue(nq); } - - return tx_done; } static void *mvneta_frag_alloc(const struct mvneta_port *pp)