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: 310906 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A784E2C0091 for ; Wed, 15 Jan 2014 10:58:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751958AbaANX6A (ORCPT ); Tue, 14 Jan 2014 18:58:00 -0500 Received: from smtpfb2-g21.free.fr ([212.27.42.10]:52341 "EHLO smtpfb2-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751727AbaANX56 (ORCPT ); Tue, 14 Jan 2014 18:57:58 -0500 Received: from smtp1-g21.free.fr (smtp1-g21.free.fr [212.27.42.1]) by smtpfb2-g21.free.fr (Postfix) with ESMTP id 86FD3CA9A95 for ; Wed, 15 Jan 2014 00:48:09 +0100 (CET) Received: from smtp.natisbad.org (unknown [IPv6:2a01:e35:139b:9f90:221:70ff:fe55:8f78]) by smtp1-g21.free.fr (Postfix) with ESMTP id 4D728940031 for ; Wed, 15 Jan 2014 00:46:59 +0100 (CET) Received: by smtp.natisbad.org (Postfix, from userid 5001) id B899C2C0D65; Wed, 15 Jan 2014 00:46:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1389743218; bh=a5oDH7+W7OqI5/sEg4s2Q0YClStOaH2e1Vq6b3lbzIA=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=sup5nDov7RO/VIzb9G++Pzz81mtgEUBBZbAHMWRa4OvVjMiNq7sGaflp6EiijxBu7 6BzarNMJHtN4tM/wwzc4dZIh5ijb+yNG+EbcpQWcbfNhYn9uqoKW2kt4V0FAuNH3EX k1NXUzDQWzjkqWpyFOSiUgkGEJRBSbNYK8oLxKu0= X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on petit X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED, T_DKIM_INVALID autolearn=unavailable version=3.3.2 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 Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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)