From: Heiner Kallweit <hkallweit1@gmail.com>
To: Andrew Lunn <andrew@lunn.ch>,
Florian Fainelli <f.fainelli@gmail.com>,
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 3/3] r8169: consider new hard dependency on REALTEK_PHY
Date: Tue, 12 Nov 2019 22:25:34 +0100 [thread overview]
Message-ID: <d74af231-be05-7f3f-2c00-55ae2cd91fc4@gmail.com> (raw)
In-Reply-To: <461096ec-9185-a919-ae56-0208e73342fe@gmail.com>
Now r8169 has a hard dependency on the Realtek PHY driver. Reflect this
in Kconfig and remove the soft dependency. REALTEK_PHY depends on
PHYLIB, therefore r8169 doesn't need an explicit dependency on PHYLIB.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/Kconfig | 3 +--
drivers/net/ethernet/realtek/r8169_main.c | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/realtek/Kconfig b/drivers/net/ethernet/realtek/Kconfig
index 5e0b9d2f1..9551ad5c1 100644
--- a/drivers/net/ethernet/realtek/Kconfig
+++ b/drivers/net/ethernet/realtek/Kconfig
@@ -98,10 +98,9 @@ config 8139_OLD_RX_RESET
config R8169
tristate "Realtek 8169/8168/8101/8125 ethernet support"
depends on PCI
+ depends on REALTEK_PHY
select FW_LOADER
select CRC32
- select PHYLIB
- select REALTEK_PHY
---help---
Say Y here if you have a Realtek Ethernet adapter belonging to
the following families:
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 785987aae..73186e9b0 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -697,7 +697,6 @@ MODULE_AUTHOR("Realtek and the Linux r8169 crew <netdev@vger.kernel.org>");
MODULE_DESCRIPTION("RealTek RTL-8169 Gigabit Ethernet driver");
module_param_named(debug, debug.msg_enable, int, 0);
MODULE_PARM_DESC(debug, "Debug verbosity level (0=none, ..., 16=all)");
-MODULE_SOFTDEP("pre: realtek");
MODULE_LICENSE("GPL");
MODULE_FIRMWARE(FIRMWARE_8168D_1);
MODULE_FIRMWARE(FIRMWARE_8168D_2);
--
2.24.0
next prev parent reply other threads:[~2019-11-12 21:25 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-12 21:22 [PATCH net-next 0/3] r8169: use rtl821x_modify_extpage exported from Realtek PHY driver Heiner Kallweit
2019-11-12 21:23 ` [PATCH net-next 1/3] net: phy: realtek: export rtl821x_modify_extpage Heiner Kallweit
2019-11-13 11:24 ` kbuild test robot
2019-11-12 21:24 ` [PATCH net-next 2/3] r8169: use rtl821x_modify_extpage Heiner Kallweit
2019-11-12 21:25 ` Heiner Kallweit [this message]
2019-11-13 3:56 ` [PATCH net-next 0/3] r8169: use rtl821x_modify_extpage exported from Realtek PHY driver David Miller
2019-11-13 4:08 ` David Miller
2019-11-13 4:13 ` Florian Fainelli
2019-11-13 6:25 ` Heiner Kallweit
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=d74af231-be05-7f3f-2c00-55ae2cd91fc4@gmail.com \
--to=hkallweit1@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--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).