From patchwork Tue Apr 17 21:22:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 899719 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FQWsMgE/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Qdqb70LGz9s1d for ; Wed, 18 Apr 2018 07:36:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752888AbeDQVgl (ORCPT ); Tue, 17 Apr 2018 17:36:41 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:36931 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752658AbeDQVgk (ORCPT ); Tue, 17 Apr 2018 17:36:40 -0400 Received: by mail-wr0-f194.google.com with SMTP id f14so1799071wre.4 for ; Tue, 17 Apr 2018 14:36:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=DtqfKd8rapuGXzBGdKQSYeiJwLnzdE0XvxyuVRbtkzs=; b=FQWsMgE/fZIf0XR3lw9+HLmpTkgK2+Fy4/Xz4yYjkm1mPlLGQ8PqLkv04/ZzBzbmvN D9IpcxF2joHZjLcayJAPnEuRiIdKivPhxjkeTccAO42vHlJsYFxNZRyx8lr6Bzn4vk7L XNkMYTh/3O0PLZKulFAwsKXvyyjucjycgXZajsE+XSh66D2bEAqPzcBCFoQOh74sUVM+ KAfkkUanP2PIVKO+PerVERuRZHe06pz5oSJ8eEiIRgoBWx88+oFsh9w0kOF2mJHvnZ83 9hiV9e93eerqtmEdUNvvm1+ZvsPa7VNBFwkjo0wvcvI62DUIyZaZo1oMMe1XmnIbOkSV wJJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=DtqfKd8rapuGXzBGdKQSYeiJwLnzdE0XvxyuVRbtkzs=; b=Z8RlF+0Jym41+Y6ySLOdNJzuCIfo+icJlWli4JPr06yX630z+sOEjHPQSBddsoqlb+ LhDntS99VYRV/QJlywHtwXzdSiTfToDs5GIXBdmx1V1yH/kDt/3VYZCmCk7bFPpJbQu+ i7r7HMGa1oLBp6AbDO/fTxy8lnDmvD+XNwY9uFjVnyN9xWjTxE1owQRBwDDfyPAIRYs8 vEJ6bHLG/BBcyqYYy8G1EPpHYmnlub+9qxFO5TP4tnkii5lZ42Poe/Hz6GgJlzYPMh02 Zkg+orw7g1oTc5Z9hAppWkuefgjlxPWx5v4T2J4FG0WNtbW0n/E3gOMjgmX4MsiiBv3O kuGw== X-Gm-Message-State: ALQs6tCgsdibm94SHqily26Vy2in7Yj5xMQVlp2JkEeNhynnt0h7lSAE g35sSEPM/DjZOC6vzKXYj4mKxg== X-Google-Smtp-Source: AIpwx49UPKYkX4zSn0c/M4vjCg0SBq8zEnnW4+fsHDr76LetlOlI5m7pipjGmVbr5Ovbax26UAedYA== X-Received: by 10.223.159.1 with SMTP id l1mr2771975wrf.207.1524000998939; Tue, 17 Apr 2018 14:36:38 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a? (p200300EA8BD43D00F08F8EDB1BD10A1A.dip0.t-ipconnect.de. [2003:ea:8bd4:3d00:f08f:8edb:1bd1:a1a]) by smtp.googlemail.com with ESMTPSA id n143sm14374809wmd.29.2018.04.17.14.36.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 14:36:38 -0700 (PDT) Subject: [PATCH net-next 06/19] r8169: simplify rtl8169_alloc_rx_data From: Heiner Kallweit To: David Miller , Realtek linux nic maintainers Cc: "netdev@vger.kernel.org" References: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Message-ID: Date: Tue, 17 Apr 2018 23:22:14 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org dev->dev.parent has the same value as tp_to_dev(tp) (set by SET_NETDEV_DEV() in rtl_init_one()) and we know it can't be NULL. This allows us to simplify the code. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 34447a2e..0216ca71 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -6731,8 +6731,7 @@ static struct sk_buff *rtl8169_alloc_rx_data(struct rtl8169_private *tp, void *data; dma_addr_t mapping; struct device *d = tp_to_dev(tp); - struct net_device *dev = tp->dev; - int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1; + int node = dev_to_node(d); data = kmalloc_node(rx_buf_sz, GFP_KERNEL, node); if (!data)