diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2020-01-31 15:45:13 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2020-05-23 13:11:49 +0100 |
| commit | ab2d7899378e40e5782cad5302d9a6713a48970e (patch) | |
| tree | c516179b477f66427d92c60e805e913148ce70eb | |
| parent | 118ddf388a61ef480ac9a2b464e85abf236f0c60 (diff) | |
net: sfp: clean up sfp-bus building
Use a Kconfig symbol to control the build of sfp-bus.c
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| -rw-r--r-- | drivers/net/phy/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/net/phy/Makefile | 3 | ||||
| -rw-r--r-- | include/linux/sfp.h | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index edb1cb8a228e..c0492b8baa8d 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -252,11 +252,15 @@ config LED_TRIGGER_PHY comment "MII PHY device drivers" +config SFP_BUS + bool + config SFP tristate "SFP cage support" depends on I2C && PHYLINK depends on HWMON || HWMON=n select MDIO_I2C + select SFP_BUS config ADIN_PHY tristate "Analog Devices Industrial Ethernet PHYs" diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile index ef1a1f913417..44a019708796 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile @@ -47,8 +47,7 @@ obj-$(CONFIG_MDIO_XGENE) += mdio-xgene.o obj-$(CONFIG_NETWORK_PHY_TIMESTAMPING) += mii_timestamper.o obj-$(CONFIG_SFP) += sff.o sfp.o -sfp-obj-$(CONFIG_SFP) += sfp-bus.o -obj-y += $(sfp-obj-y) $(sfp-obj-m) +obj-$(CONFIG_SFP_BUS) += sfp-bus.o obj-$(CONFIG_ADIN_PHY) += adin.o obj-$(CONFIG_AMD_PHY) += amd.o diff --git a/include/linux/sfp.h b/include/linux/sfp.h index 2da1a5181779..fe9af556899f 100644 --- a/include/linux/sfp.h +++ b/include/linux/sfp.h @@ -530,7 +530,7 @@ struct sfp_upstream_ops { void (*disconnect_phy)(void *priv); }; -#if IS_ENABLED(CONFIG_SFP) +#if IS_ENABLED(CONFIG_SFP_BUS) int sfp_parse_port(struct sfp_bus *bus, const struct sfp_eeprom_id *id, unsigned long *support); bool sfp_may_have_phy(struct sfp_bus *bus, const struct sfp_eeprom_id *id); |