From patchwork Thu Oct 4 18:14:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 189232 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 C5B402C0386 for ; Fri, 5 Oct 2012 04:16:22 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753448Ab2JDSQG (ORCPT ); Thu, 4 Oct 2012 14:16:06 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:35439 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754428Ab2JDSPR (ORCPT ); Thu, 4 Oct 2012 14:15:17 -0400 Received: by mail-wi0-f172.google.com with SMTP id hq12so4700923wib.1 for ; Thu, 04 Oct 2012 11:15:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=hzUOYggXWdLLG/nKsfw/8ekjBj+fvi2X8IEEIoFAN+s=; b=SGPdk9uQ2NPWUX2fDEXaMY3vRZpiMWO8LsEKQCdlMIzxI6+wJUO+AhX8qwmAWv+ZDA E8XlU4/GhJHB91g9HtOIweadVCEnbd6ncUuL+lQXkvutAcdw1r9npnA3AVeeJqCKNdjm M3ONcHylHUGY8nooJ6uaDEYCx2f6IEx9oErF/9D4hAAE8BIHwbba05ouHfOso9kai1Eq cILPwUFl9FTmInyQVwN1Yz4eYQ4FHC3BBDp64++lLwi7gM5S62L6QaBnVGf5HFCz/C3o E0I5Zzd95eZf9x+jgN4qvOOXQUijkuOTqR3cBtSDshv9/P1GD2zdR55XR2DV0NoV/rSQ hUXQ== Received: by 10.180.79.2 with SMTP id f2mr39908832wix.2.1349374516853; Thu, 04 Oct 2012 11:15:16 -0700 (PDT) Received: from localhost (nat-2.starnet.cz. [92.62.224.2]) by mx.google.com with ESMTPS id ay10sm11031669wib.2.2012.10.04.11.15.16 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 04 Oct 2012 11:15:16 -0700 (PDT) From: Michal Simek To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Michal Simek , Anirudha Sarangi , John Linn , Grant Likely , Rob Herring , "David S. Miller" Subject: [PATCH 10/11] net: ll_temac: Simplify xmit Date: Thu, 4 Oct 2012 20:14:56 +0200 Message-Id: <1349374497-9540-10-git-send-email-monstr@monstr.eu> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1349374497-9540-1-git-send-email-monstr@monstr.eu> References: <1349374497-9540-1-git-send-email-monstr@monstr.eu> X-Gm-Message-State: ALoCoQmcb/MBM4BKuIRUwxEpeYqmMnUh/6MKd8f0OLJO0IkdRDUA6amDRQf7bh5O8dsumG+54Xgt Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use one return statement instead of two. Signed-off-by: Michal Simek CC: Anirudha Sarangi CC: John Linn CC: Grant Likely CC: Rob Herring CC: David S. Miller --- drivers/net/ethernet/xilinx/ll_temac_main.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index fec42d9..58b2869 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c @@ -690,10 +690,8 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) cur_p = &lp->tx_bd_v[lp->tx_bd_tail]; if (temac_check_tx_bd_space(lp, num_frag)) { - if (!netif_queue_stopped(ndev)) { + if (!netif_queue_stopped(ndev)) netif_stop_queue(ndev); - return NETDEV_TX_BUSY; - } return NETDEV_TX_BUSY; }