From patchwork Wed Jul 18 16:10:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10532821 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6A637601D2 for ; Wed, 18 Jul 2018 16:13:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A093290A4 for ; Wed, 18 Jul 2018 16:13:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4CBAC290B9; Wed, 18 Jul 2018 16:13:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E1527290A4 for ; Wed, 18 Jul 2018 16:13:13 +0000 (UTC) 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:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=mpXySiotJq4fXPFPiccBGnE8QPCc+DNLrgUQhhiLf9g=; b=r+VIYIVl2bAsn0n6QY5YB6FtQo P8bvPJBn/9ZG/roVlgLoBg1tw0mHzGO9DLITzrq2mlmkMy7aiYXUw37+9SJBTLaB/NDYg8FoB47ab HsfYL/EndqaDh0b7FylW39exI/DNah+LW4BBQD84NIHTASTEYQEiUkwief/vXX6dfd/l6Th5pkHlS Vgrzswe/ULhg2bH/LJ9JOquX5RWgA9KI3Yc6pT+GEoglCLE3FsBnes2aqyVA3CqtuHZadfbQJazXT vPEYqAw7SFOLvjWp8D9faTTikfVXQN0WsAUhdaFCilA9oJ4NIaTX2y/FbTM81/+9RkNQ0rE7w61hB Yd0XxNIQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1ffp4f-0005V2-Us; Wed, 18 Jul 2018 16:13:09 +0000 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ffp2Z-0002m0-7A for linux-arm-kernel@lists.infradead.org; Wed, 18 Jul 2018 16:11:01 +0000 Received: by mail-wm0-x22c.google.com with SMTP id 69-v6so3444314wmf.3 for ; Wed, 18 Jul 2018 09:10:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AZzCltgnNdPyeZzXiMFjWCg4GFVgDog5WHEdONSaQYA=; b=0YpQBTGjX84ndXw1Qum4CiP3P2WxZurvYZThnuNXWR08RnwbPI4e2GjvoVhUdyEBth GxlkSsth9vK6cOICNeN9DdEtvnvF74ZfP3/vuLuJArkElGJV1YNsYRqHCgERqCOVHQ34 SXrgeL6dBhbLeWlU8Z4JNeI7RB6s/eLqa5j0O8lkGcKo1fiwwLM83cgkxhwz4wrhhNVD RnVS5Emrddpb289sl2cJYb1sfT2soXpIJtm9c/RgLXQ7nwb7a6BfGQBCBO4F2wXAPiuK MYGpqbtrLZDXIke2bNcTOC1WtgoXZsWF8a0yEQWSQyaY0AHTRjHGwPKg8wJzrA55WbPG FDdA== 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=AZzCltgnNdPyeZzXiMFjWCg4GFVgDog5WHEdONSaQYA=; b=om4pbM4Rvf1d4LxFDx/kgqcOQo2ihSfLwpjM9lInJT0o6NDp0HG2Ocj+/IE+Zb13K1 6knPkMKRuPpoDir/WVrrwcId6wUwdASV0CSAndwZ7QGuBe1C1c4wiprk/x5bEz3fkNFG kD+s4deQrt9diHfFNkL2gZMnGaPkVIwADeFO/4OPX+cidKQY2/or9yJOJfaJm+IDsHgl u4wuMLL9ZJbKLMLX4IgESAkQ8SV7/lAFVjS1Mu4Gqm8u38P/CQ1emnzBgiXIcRrLCmBS fli2sSRVOPowJbHtSods0mHfSkc2LTsyybDfE1CTMSyZwLvh8xuk8VHrn473QeT+KTKU zy2w== X-Gm-Message-State: AOUpUlEmEEGoQQmSTGkgIFF1I9R/kEwfNv0lWfEwCkb9TG7KjSTkFDhg 5sivxKtloNyTAvz2YWoXwOdrsA== X-Google-Smtp-Source: AAOMgpe57NW0DQDrONhZjG8SlJwhk7i/pp3Ii9AltAolWcQJMvLYWVi8kJi6JCEEY5x61NvhhAjheA== X-Received: by 2002:a1c:888e:: with SMTP id k136-v6mr2069766wmd.6.1531930243447; Wed, 18 Jul 2018 09:10:43 -0700 (PDT) Received: from brgl-bgdev.home ([2a01:cb1d:af:5b00:e837:b8d5:48c1:571b]) by smtp.gmail.com with ESMTPSA id v185-v6sm2847803wme.30.2018.07.18.09.10.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Jul 2018 09:10:42 -0700 (PDT) From: Bartosz Golaszewski To: Sekhar Nori , Kevin Hilman , Russell King , Grygorii Strashko , "David S . Miller" , Srinivas Kandagatla , Lukas Wunner , Rob Herring , Florian Fainelli , Dan Carpenter , Ivan Khoronzhuk , David Lechner , Greg Kroah-Hartman , Andrew Lunn Subject: [PATCH 1/5] net: visually shrink eth_platform_get_mac_address() Date: Wed, 18 Jul 2018 18:10:31 +0200 Message-Id: <20180718161035.7005-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180718161035.7005-1-brgl@bgdev.pl> References: <20180718161035.7005-1-brgl@bgdev.pl> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180718_091059_472749_80BCB112 X-CRM114-Status: GOOD ( 13.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: netdev@vger.kernel.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski MIME-Version: 1.0 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 From: Bartosz Golaszewski Initialize the variables with proper values so that we save a few lines of code before we extend this function in the follow-up patches. Signed-off-by: Bartosz Golaszewski --- net/ethernet/eth.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index ee28440f57c5..da8530879e1e 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c @@ -527,15 +527,10 @@ unsigned char * __weak arch_get_platform_mac_address(void) int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr) { - const unsigned char *addr; - struct device_node *dp; + struct device_node *dp = dev_is_pci(dev) ? + pci_device_to_OF_node(to_pci_dev(dev)) : dev->of_node; + const unsigned char *addr = NULL; - if (dev_is_pci(dev)) - dp = pci_device_to_OF_node(to_pci_dev(dev)); - else - dp = dev->of_node; - - addr = NULL; if (dp) addr = of_get_mac_address(dp); if (!addr)