From patchwork Sat Oct 31 19:45:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?TWFoZXNoIEJhbmRld2FyICjgpK7gpLngpYfgpLYg4KSs4KSC4KSh4KWH4KS14KS+4KSwKQ==?= X-Patchwork-Id: 538687 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 EB1061413B5 for ; Sun, 1 Nov 2015 06:45:52 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=FRLh8qmr; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751292AbbJaTpq (ORCPT ); Sat, 31 Oct 2015 15:45:46 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:32841 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751075AbbJaTpH (ORCPT ); Sat, 31 Oct 2015 15:45:07 -0400 Received: by padhy1 with SMTP id hy1so100002628pad.0 for ; Sat, 31 Oct 2015 12:45:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=Oz8geMGRH1n9GE6oP3LndYJc8PwjlLQllqQYiCcA8As=; b=FRLh8qmrLCCZSWQ+DRrBd4LZJ7xRjeD2MMN48Dg6F969lNbXVcIJKJ8qLj29OTvtQB efEf9TDF3XlLA4TTt6r61vy6wdHMCmtwnAAd3Gd7vdHnRX06tXGKzs8XUP4fUH8wFlKI Z0KTI7U1sUKIAQ09Nmt6Hsdulw31UgDUVGsdGufCMMNtPT6BcnI5y2QAOe4tNrlcMBtY T8vssRaYvdPdvaW041lLVe4J0hLoOzHhzFOX+oGrRZyLfJB6F1KGzeD0FJD2fV81cB1b a7mRU02b9ny3p0C+e0h3Y97pg568VM8ZJDspMcHPekmiQrx42VUehv/GcOFj/3aJwbl+ NLVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Oz8geMGRH1n9GE6oP3LndYJc8PwjlLQllqQYiCcA8As=; b=RF3I+sDWLygEffbe/PucYCWnAL5AeVCXJd3jc3NBbqNN45rnflPNzl2lGPYwdAhM0F e1yW3cbmhfIYQQPQXzhzj0fcfgcP67w2xtlwSwhRCRVP3nFHijw+G/oardTspQy2wK0o k/hUxNpWl3B5e1tTFp1ftZPYiTW2EPRjW+z2eWN/5lRMhLwLlaIeTp8R+JvGsbTiQxUK zRcIfL5jGWY8WBJ+v896l8oENF11CBP67I/4ZnsZrdvLD42If7MSt2OqIIFm3BJkyExI 8nq/otJavEYrZ8DWoapciU6G7NnuNvMqZAA3Gp/TiRdsEC91YXAwDcW1+BQkXdZd+uNl hrCQ== X-Gm-Message-State: ALoCoQkaI6lQk5afoKu+JxD53EZrNsWe91mup2dHbOZhKtLt5k1hVVOW+s/DY+wrT5d2Xqv82mHq X-Received: by 10.66.144.130 with SMTP id sm2mr16874411pab.105.1446320706466; Sat, 31 Oct 2015 12:45:06 -0700 (PDT) Received: from localhost ([2620:0:1000:3002:55f:89c2:1ea0:ca1e]) by smtp.gmail.com with ESMTPSA id ey17sm15306075pac.26.2015.10.31.12.45.05 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Sat, 31 Oct 2015 12:45:05 -0700 (PDT) From: Mahesh Bandewar To: Jay Vosburgh , Andy Gospodarek , Veaceslav Falico , Nikolay Aleksandrov , David Miller Cc: Mahesh Bandewar , David Decotigny , netdev Subject: [PATCH next 1/3] bonding: Simplify __get_duplex function. Date: Sat, 31 Oct 2015 12:45:00 -0700 Message-Id: <1446320700-38613-1-git-send-email-maheshb@google.com> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Eliminate 'else' clause by simply initializing variable Signed-off-by: Mahesh Bandewar --- drivers/net/bonding/bond_3ad.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index 3c45358844eb..3a17fd207ec6 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c @@ -327,14 +327,12 @@ static u16 __get_link_speed(struct port *port) static u8 __get_duplex(struct port *port) { struct slave *slave = port->slave; - u8 retval; + u8 retval = 0x0; /* handling a special case: when the configuration starts with * link down, it sets the duplex to 0. */ - if (slave->link != BOND_LINK_UP) { - retval = 0x0; - } else { + if (slave->link == BOND_LINK_UP) { switch (slave->duplex) { case DUPLEX_FULL: retval = 0x1;