From: Heiner Kallweit <hkallweit1@gmail.com>
To: David Miller <davem@davemloft.net>,
Realtek linux nic maintainers <nic_swsd@realtek.com>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: [PATCH net-next 06/19] r8169: simplify rtl8169_alloc_rx_data
Date: Tue, 17 Apr 2018 23:22:14 +0200 [thread overview]
Message-ID: <b8f349af-90f1-e8f6-2b83-bdecd3eea9f0@gmail.com> (raw)
In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com>
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>
---
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)
--
2.17.0
next prev parent reply other threads:[~2018-04-17 21:36 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-17 21:16 [PATCH net-next 00/19] r8169: series with further smaller improvements Heiner Kallweit
2018-04-17 21:17 ` [PATCH net-next 01/19] r8169: remove unused member features from struct Heiner Kallweit
2018-04-17 21:18 ` [PATCH net-next 02/19] r8169: remove member align from struct rtl_cfg_info Heiner Kallweit
2018-04-17 21:19 ` [PATCH net-next 03/19] r8169: use skb_copy_to_linear_data in rtl8169_try_rx_copy Heiner Kallweit
2018-04-17 21:20 ` [PATCH net-next 04/19] r8169: use constant NAPI_POLL_WAIT Heiner Kallweit
2018-04-17 21:21 ` [PATCH net-next 05/19] r8169: switch to napi_schedule_irqoff Heiner Kallweit
2018-04-17 21:22 ` Heiner Kallweit [this message]
2018-04-17 21:23 ` [PATCH net-next 07/19] r8169: improve rtl8169_init_ring Heiner Kallweit
2018-04-17 21:24 ` [PATCH net-next 08/19] r8169: remove unneeded check in rtl8169_rx_fill Heiner Kallweit
2018-04-17 21:25 ` [PATCH net-next 09/19] r8169: replace rx_buf_sz with a constant Heiner Kallweit
2018-04-17 21:26 ` [PATCH net-next 10/19] r8169: remove rtl8169_map_to_asic Heiner Kallweit
2018-04-17 21:27 ` [PATCH net-next 11/19] r8169: change hw_start argument type Heiner Kallweit
2018-04-17 21:28 ` [PATCH net-next 12/19] r8169: change argument type of counters handling functions Heiner Kallweit
2018-04-17 21:29 ` [PATCH net-next 13/19] r8169: change interrupt handler argument type Heiner Kallweit
2018-04-17 21:30 ` [PATCH net-next 14/19] r8169: drop member opts1_mask from struct rtl8169_private Heiner Kallweit
2018-04-17 21:31 ` [PATCH net-next 15/19] r8169: don't display tp->mmio_addr address Heiner Kallweit
2018-04-17 21:32 ` [PATCH net-next 16/19] r8169: improve rtl8169_get_mac_version Heiner Kallweit
2018-04-17 21:33 ` [PATCH net-next 17/19] r8169: drop member txd_version from struct rtl8169_private Heiner Kallweit
2018-04-17 21:34 ` [PATCH net-next 18/19] r8169: improve pci region handling Heiner Kallweit
2018-04-17 21:36 ` [PATCH net-next 19/19] r8169: remove jumbo_tx_csum from chip config struct Heiner Kallweit
2018-04-19 1:13 ` [PATCH net-next 00/19] r8169: series with further smaller improvements David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b8f349af-90f1-e8f6-2b83-bdecd3eea9f0@gmail.com \
--to=hkallweit1@gmail.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=nic_swsd@realtek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).