Skip to contentSkip to conversation

phy: ralink: phy-mt7621-pci: some fixes for COMPILE_TEST

PATCH Applied Sergio Paracuellos 2 participants 5 messages Dec 1, 2020

Subsystems (4)
lore
Share & tools
lore

Sergio Paracuellos

author maintainer
#0 lore raw

v3 cover phy: ralink: phy-mt7621-pci: some fixes for COMPILE_TEST

Hi Vinod,

After merging the phy-next tree, today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/phy/ralink/phy-mt7621-pci.c:17:10: fatal error: mt7621.h: No such file or directory 17 | #include <mt7621.h>
| ^~~~~~~~~~

This driver has two includes which are in "arch/mips/include/asm/mach-ralink" and are directly included in the driver:
* mt7621.h
* ralink_regs.h

This is because this path is directly included in 'arch/mips/ralink/Platform' for "ralink".

Adding the include search path to the phy ralink directory fix the problem but as you told me I finally end up removing COMPILE_TEST from Kconfig.

Making 'allmodconfig' in x86_64 also showed two warnings for this driver because of pointer size and not valid name for MODULE_DEVICE_TABLE ids.

Ids for the macro has been also included in this series.

Changes in v3:
- PATCH 1/3 completely changed:
- Makefile is not touched.
- Drop 'COMPILE_TEST' in Kconfig.
- Drop PATCH 2/3 in previous series because COMPILE_TEST does not apply anymore.

Changes in v2:
- Added 'Reported-by' tag in PATCH 1/3.

Best regards,
Sergio Paracuellos

Sergio Paracuellos (2):
phy: ralink: phy-mt7621-pci: drop 'COMPILE_TEST' from Kconfig
phy: ralink: phy-mt7621-pci: set correct name in MODULE_DEVICE_TABLE
macro

 drivers/phy/ralink/Kconfig          | 2 +-
 drivers/phy/ralink/phy-mt7621-pci.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.25.1
author maintainer
#1 lore raw

PATCH v3 1/2 phy: ralink: phy-mt7621-pci: drop 'COMPILE_TEST' from Kconfig

This driver includes the following two files directly:
- mt7621.h
- ralink_regs.h

Compilation for its related platform properly works because its real path is included in 'arch/mips/ralink/Platform' as cflags.

This driver depends on RALINK but also is enabled for COMPILE_TEST where nothing about its platform is known and this directly included files are not found at all breaking compilation.

If we want 'COMPILE_TEST' we have to change cflags also inside 'phy/ralink' subdirectory Makefile which seems that does not like to linux-phy maintainers. Hence remove COMPILE_TEST from Kconfig to avoid the problem.

Fixes d87da32372a0 ("phy: ralink: Add PHY driver for MT7621 PCIe PHY")
---
 drivers/phy/ralink/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/ralink/Kconfig +1 -1
index 2fabb14d2998..ecc309ba9fee 100644
@@ -4,7 +4,7 @@
 #
 config PHY_MT7621_PCI
 	tristate "MediaTek MT7621 PCI PHY Driver"
-	depends on (RALINK || COMPILE_TEST) && OF
+	depends on RALINK && OF
 	select GENERIC_PHY
 	select REGMAP_MMIO
 	help
Signature · 1 line
2.25.1
author maintainer
#2 lore raw

PATCH v3 2/2 phy: ralink: phy-mt7621-pci: set correct name in MODULE_DEVICE_TABLE macro

In reply to Sergio Paracuellos

Correct name passed into 'MODULE_DEVICE_TABLE' which was wrong and was showing a warning when the driver is enabled for 'COMPILE_TEST'.

---
 drivers/phy/ralink/phy-mt7621-pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/ralink/phy-mt7621-pci.c +1 -1
index db79088d5362..9a610b414b1f 100644
@@ -335,7 +335,7 @@ static const struct of_device_id mt7621_pci_phy_ids[] = {
 	{ .compatible = "mediatek,mt7621-pci-phy" },
 	{},
 };
-MODULE_DEVICE_TABLE(of, mt7621_pci_ids);
+MODULE_DEVICE_TABLE(of, mt7621_pci_phy_ids);
 
 static struct platform_driver mt7621_pci_phy_driver = {
 	.probe = mt7621_pci_phy_probe,
Signature · 1 line
2.25.1
maintainer Applied
#3 lore raw
In reply to Sergio Paracuellos
Quoted 18 lines · Sergio Paracuellos

Hi Vinod,

After merging the phy-next tree, today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/phy/ralink/phy-mt7621-pci.c:17:10: fatal error: mt7621.h: No such file or directory 17 | #include <mt7621.h>
| ^~~~~~~~~~

This driver has two includes which are in "arch/mips/include/asm/mach-ralink" and are directly included in the driver:
* mt7621.h
* ralink_regs.h

This is because this path is directly included in 'arch/mips/ralink/Platform' for "ralink".

Quoted 7 lines

Adding the include search path to the phy ralink directory fix the problem but as you told me I finally end up removing COMPILE_TEST from Kconfig.

Making 'allmodconfig' in x86_64 also showed two warnings for this driver because of pointer size and not valid name for MODULE_DEVICE_TABLE ids.

Ids for the macro has been also included in this series.

Applied, thanks

Signature · 1 line
~Vinod
author maintainer
#4 lore raw
Quoted 23 lines · Vinod Koul
Quoted 21 lines · Sergio Paracuellos

Hi Vinod,

After merging the phy-next tree, today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/phy/ralink/phy-mt7621-pci.c:17:10: fatal error: mt7621.h: No such file or directory 17 | #include <mt7621.h>
| ^~~~~~~~~~

This driver has two includes which are in "arch/mips/include/asm/mach-ralink" and are directly included in the driver:
* mt7621.h
* ralink_regs.h

This is because this path is directly included in 'arch/mips/ralink/Platform' for "ralink".

Adding the include search path to the phy ralink directory fix the problem but as you told me I finally end up removing COMPILE_TEST from Kconfig.

Quoted 7 lines
Quoted 4 lines

Making 'allmodconfig' in x86_64 also showed two warnings for this driver because of pointer size and not valid name for MODULE_DEVICE_TABLE ids.

Ids for the macro has been also included in this series.

Applied, thanks

Thanks for letting me know.

Best regards,
Sergio Paracuellos

Quoted 2 lines

--
~Vinod