]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
phy: phy-can-transceiver: Decouple assignment and definition in probe
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 13 May 2026 22:01:30 +0000 (00:01 +0200)
committerVinod Koul <vkoul@kernel.org>
Thu, 14 May 2026 15:32:21 +0000 (21:02 +0530)
The code like

int foo = X;
...
if (bar)
foo = Y;

is prone to subtle mistakes and hence harder to maintain as the foo value
may be changed inadvertently while code in '...' grown in lines. On top
it's harder to navigate to understand the possible values of foo when branch
is not taken (requires to look somewhere else in the code, far from the piece
at hand).

Besides that in case of taken branch the foo will be rewritten, which is
not a problem per se, just an unneeded operation.

Decouple assignment and definition to use if-else to address the inconveniences
described above.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patch.msgid.link/20260513220336.369628-6-andriy.shevchenko@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/phy/phy-can-transceiver.c

index 3cebaa54f7db91d8206f46b9212145dbd095d7bf..30330499585be9109666940cfe0e3927cbf77071 100644 (file)
@@ -128,8 +128,8 @@ static int can_transceiver_phy_probe(struct platform_device *pdev)
        struct gpio_desc *standby_gpio;
        struct gpio_desc *enable_gpio;
        struct mux_state *mux_state;
-       int err, i, num_ch = 1;
        const char *propname;
+       int err, i, num_ch;
        u32 max_bitrate;
 
        drvdata = device_get_match_data(dev);
@@ -138,6 +138,8 @@ static int can_transceiver_phy_probe(struct platform_device *pdev)
 
        if (drvdata->flags & CAN_TRANSCEIVER_DUAL_CH)
                num_ch = 2;
+       else
+               num_ch = 1;
 
        priv = devm_kzalloc(dev, struct_size(priv, can_transceiver_phy, num_ch), GFP_KERNEL);
        if (!priv)