From 80f3df6e254d860cc7a41d5f2ae37fe717644098 Mon Sep 17 00:00:00 2001 From: Josua Mayer Date: Thu, 26 Feb 2026 15:21:10 +0200 Subject: [PATCH] phy: renesas: rcar-gen3-usb2: rename local mux helper to avoid conflict Rename the temporary devm_mux_state_get_optional function to avoid conflict with upcoming implementation in multiplexer subsystem. Signed-off-by: Josua Mayer Reviewed-by: Wolfram Sang Acked-by: Vinod Koul Signed-off-by: Ulf Hansson --- drivers/phy/renesas/phy-rcar-gen3-usb2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c index cfc2a8d9028d..1155b111420a 100644 --- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c +++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c @@ -941,7 +941,7 @@ static int rcar_gen3_phy_usb2_vbus_regulator_register(struct rcar_gen3_chan *cha /* Temporary wrapper until the multiplexer subsystem supports optional muxes */ static inline struct mux_state * -devm_mux_state_get_optional(struct device *dev, const char *mux_name) +rcar_gen3_phy_mux_state_get_optional(struct device *dev, const char *mux_name) { if (!of_property_present(dev->of_node, "mux-states")) return NULL; @@ -1036,7 +1036,7 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev) phy_set_drvdata(channel->rphys[i].phy, &channel->rphys[i]); } - mux_state = devm_mux_state_get_optional(dev, NULL); + mux_state = rcar_gen3_phy_mux_state_get_optional(dev, NULL); if (IS_ERR(mux_state)) return PTR_ERR(mux_state); if (mux_state) {