From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Tue, 17 Apr 2018 21:22:14 +0000 (+0200)
Subject: r8169: simplify rtl8169_alloc_rx_data
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d3b404c29c97ecf56001dc94f94a5b8e5efcd2e3;p=openwrt%2Fstaging%2Fblogic.git

r8169: simplify rtl8169_alloc_rx_data

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 <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 34447a2e3763..0216ca71d1aa 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)