From: Michael Schmitz <schmitzmic@gmail.com>
To: netdev@vger.kernel.org
To: netdev@vger.kernel-org
Cc: anders.roxell@linaro.org, Michael Schmitz <schmitzmic@gmail.com>,
andrew@lunn.ch, davem@davemloft.net, sfr@canb.auug.org.au
Subject: [PATCH net v3] net: phy: rename Asix Electronics PHY driver
Date: Fri, 7 Jun 2019 17:37:34 +1200 [thread overview]
Message-ID: <1559885854-15904-1-git-send-email-schmitzmic@gmail.com> (raw)
In-Reply-To: <20190514105649.512267cd@canb.auug.org.au>
[Resent to net instead of net-next - may clash with Anders Roxell's patch
series addressing duplicate module names]
Commit 31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver")
introduced a new PHY driver drivers/net/phy/asix.c that causes a module
name conflict with a pre-existiting driver (drivers/net/usb/asix.c).
The PHY driver is used by the X-Surf 100 ethernet card driver, and loaded
by that driver via its PHY ID. A rename of the driver looks unproblematic.
Rename PHY driver to ax88796b.c in order to resolve name conflict.
Signed-off-by: Michael Schmitz <schmitzmic@gmail.com>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
Fixes: 31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver")
---
Changes from v1:
- merge into single commit (suggested by Andrew Lunn)
Changes from v2:
- use rename flag for diff (suggested by Andrew Lunn)
---
drivers/net/ethernet/8390/Kconfig | 2 +-
drivers/net/phy/Kconfig | 2 +-
drivers/net/phy/Makefile | 2 +-
drivers/net/phy/{asix.c => ax88796b.c} | 0
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig
index f2f0264..443b34e 100644
--- a/drivers/net/ethernet/8390/Kconfig
+++ b/drivers/net/ethernet/8390/Kconfig
@@ -49,7 +49,7 @@ config XSURF100
tristate "Amiga XSurf 100 AX88796/NE2000 clone support"
depends on ZORRO
select AX88796
- select ASIX_PHY
+ select AX88796B_PHY
help
This driver is for the Individual Computers X-Surf 100 Ethernet
card (based on the Asix AX88796 chip). If you have such a card,
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index d629971..5496e5c 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -253,7 +253,7 @@ config AQUANTIA_PHY
---help---
Currently supports the Aquantia AQ1202, AQ2104, AQR105, AQR405
-config ASIX_PHY
+config AX88796B_PHY
tristate "Asix PHYs"
help
Currently supports the Asix Electronics PHY found in the X-Surf 100
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index 27d7f9f..5b5c866 100644
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -52,7 +52,7 @@ ifdef CONFIG_HWMON
aquantia-objs += aquantia_hwmon.o
endif
obj-$(CONFIG_AQUANTIA_PHY) += aquantia.o
-obj-$(CONFIG_ASIX_PHY) += asix.o
+obj-$(CONFIG_AX88796B_PHY) += ax88796b.o
obj-$(CONFIG_AT803X_PHY) += at803x.o
obj-$(CONFIG_BCM63XX_PHY) += bcm63xx.o
obj-$(CONFIG_BCM7XXX_PHY) += bcm7xxx.o
diff --git a/drivers/net/phy/asix.c b/drivers/net/phy/ax88796b.c
similarity index 100%
rename from drivers/net/phy/asix.c
rename to drivers/net/phy/ax88796b.c
--
1.9.1
next prev parent reply other threads:[~2019-06-07 5:37 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-14 0:15 linux-next: build failure after merge of the ecryptfs tree Stephen Rothwell
2019-05-14 0:40 ` Masahiro Yamada
2019-05-14 0:56 ` Stephen Rothwell
2019-05-14 1:22 ` Michael Schmitz
2019-05-15 4:28 ` Michael Schmitz
2019-05-17 20:25 ` [PATCH 0/3] resolve module name conflict for asix PHY and USB modules Michael Schmitz
2019-05-17 21:20 ` Andrew Lunn
2019-05-18 1:17 ` Michael Schmitz
2019-05-17 20:25 ` [PATCH 1/3] net: phy: new ax88796b.c Asix Electronics PHY driver Michael Schmitz
2019-05-17 20:25 ` [PATCH 2/3] net: 8390: switch X-Surf 100 driver to use ax88796b PHY Michael Schmitz
2019-05-17 20:25 ` [PATCH 3/3] net: phy: remove old Asix Electronics PHY driver Michael Schmitz
2019-05-18 1:14 ` [PATCH v2] net: phy: rename " Michael Schmitz
2019-05-18 14:20 ` Andrew Lunn
2019-05-18 17:48 ` Michael Schmitz
2019-05-18 18:04 ` Andrew Lunn
2019-06-07 5:37 ` Michael Schmitz [this message]
2019-06-07 13:00 ` [PATCH net v3] " Andrew Lunn
2019-06-08 1:54 ` Michael Schmitz
2019-06-09 20:24 ` David Miller
2019-05-14 1:03 ` linux-next: build failure after merge of the ecryptfs tree Stephen Rothwell
2019-05-14 4:16 ` Masahiro Yamada
2019-05-14 4:49 ` Stephen Rothwell
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=1559885854-15904-1-git-send-email-schmitzmic@gmail.com \
--to=schmitzmic@gmail.com \
--cc=anders.roxell@linaro.org \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.