]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
phy: can-transceiver: Drop unnecessary "mux-states" property presence check
authorRob Herring (Arm) <robh@kernel.org>
Mon, 3 Feb 2025 18:54:21 +0000 (12:54 -0600)
committerVinod Koul <vkoul@kernel.org>
Mon, 10 Feb 2025 17:10:19 +0000 (22:40 +0530)
It doesn't matter whether "mux-states" is not present or there is some
other issue parsing it causing an error. Drop the presence check and
rework the error handling to ignore anything other than deferred probe.

Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Link: https://lore.kernel.org/r/20250203185421.3383805-2-robh@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/phy/phy-can-transceiver.c

index ee4ce42496985d28baf9a7e3172dd902cc7254f9..2bec70615449f94d2bf5725c094cd574beb163c1 100644 (file)
@@ -103,6 +103,7 @@ static int can_transceiver_phy_probe(struct platform_device *pdev)
        struct phy *phy;
        struct gpio_desc *standby_gpio;
        struct gpio_desc *enable_gpio;
+       struct mux_state *mux_state;
        u32 max_bitrate = 0;
        int err;
 
@@ -113,13 +114,11 @@ static int can_transceiver_phy_probe(struct platform_device *pdev)
        match = of_match_node(can_transceiver_phy_ids, pdev->dev.of_node);
        drvdata = match->data;
 
-       if (of_property_read_bool(dev->of_node, "mux-states")) {
-               struct mux_state *mux_state;
-
-               mux_state = devm_mux_state_get(dev, NULL);
-               if (IS_ERR(mux_state))
-                       return dev_err_probe(&pdev->dev, PTR_ERR(mux_state),
-                                            "failed to get mux\n");
+       mux_state = devm_mux_state_get(dev, NULL);
+       if (IS_ERR(mux_state)) {
+               if (PTR_ERR(mux_state) == -EPROBE_DEFER)
+                       return PTR_ERR(mux_state);
+       } else {
                can_transceiver_phy->mux_state = mux_state;
        }