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 <josua@solid-run.com>
Acked-by: Vinod Koul <vkoul@kernel.org>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/phy/phy-can-transceiver.c b/drivers/phy/phy-can-transceiver.c
index 330356706ad7bd40901f2cab928f90e1b4dc6c5a..fcbca9d2bded029f302efe4e39f308991d0f4c01 100644 (file)
--- 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);