diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2020-01-31 15:45:13 +0000 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-04-16 16:52:44 +0100 |
| commit | 8f62da07973b358fec7fbb9828369ade2dbfb853 (patch) | |
| tree | b6bd78e4d2465610a3bcec19b528d60b51cd09d1 | |
| parent | 6538d9758fc1b1244d6adef2a775aa8cda3d9cfa (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 9e2672800f0b..8ac5a4fb1181 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -68,11 +68,15 @@ config RUST_PHYLIB_ABSTRACTIONS Adds support needed for PHY drivers written in Rust. It provides a wrapper around the C phylib core. +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 comment "MII PHY device drivers" diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile index dc4c583f7e00..355ecd213761 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile @@ -29,8 +29,7 @@ obj-$(CONFIG_PHYLIB) += libphy.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_ADIN1100_PHY) += adin1100.o diff --git a/include/linux/sfp.h b/include/linux/sfp.h index 9346cd44814d..552beaca6f4f 100644 --- a/include/linux/sfp.h +++ b/include/linux/sfp.h @@ -547,7 +547,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); |