From: Josua Mayer Date: Thu, 26 Feb 2026 13:21:09 +0000 (+0200) Subject: phy: can-transceiver: rename temporary helper function to avoid conflict X-Git-Tag: v7.1-rc1~157^2~52^2~8 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=b6376ccdcb4bf7163fc4cbe5f83e265bc1660d4f;p=thirdparty%2Fkernel%2Flinux.git phy: can-transceiver: rename temporary helper function 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 Acked-by: Vinod Koul Reviewed-by: Wolfram Sang Signed-off-by: Ulf Hansson --- diff --git a/drivers/phy/phy-can-transceiver.c b/drivers/phy/phy-can-transceiver.c index 330356706ad7b..fcbca9d2bded0 100644 --- a/drivers/phy/phy-can-transceiver.c +++ b/drivers/phy/phy-can-transceiver.c @@ -128,7 +128,7 @@ MODULE_DEVICE_TABLE(of, can_transceiver_phy_ids); /* 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) +can_transceiver_phy_mux_state_get_optional(struct device *dev, const char *mux_name) { if (!of_property_present(dev->of_node, "mux-states")) return NULL; @@ -183,7 +183,7 @@ static int can_transceiver_phy_probe(struct platform_device *pdev) priv->num_ch = num_ch; platform_set_drvdata(pdev, priv); - mux_state = devm_mux_state_get_optional(dev, NULL); + mux_state = can_transceiver_phy_mux_state_get_optional(dev, NULL); if (IS_ERR(mux_state)) return PTR_ERR(mux_state);