]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
can: rcar_can: Add helper variable dev to rcar_can_probe()
authorGeert Uytterhoeven <geert+renesas@glider.be>
Fri, 22 Aug 2025 10:17:03 +0000 (12:17 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Fri, 19 Sep 2025 17:25:14 +0000 (19:25 +0200)
rcar_can_probe() has many users of "pdev->dev".  Introduce a shorthand
to simplify the code.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://patch.msgid.link/baf34c8bef5625ae73c830dbb3c617eb8f7adddd.1755857536.git.geert+renesas@glider.be
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/rcar/rcar_can.c

index 5b0b495d127cdcb38146416d7037e17d9c6c67c8..57030992141cc52354c32db4a4eb0d0796e016fc 100644 (file)
@@ -738,6 +738,7 @@ static const char * const clock_names[] = {
 
 static int rcar_can_probe(struct platform_device *pdev)
 {
+       struct device *dev = &pdev->dev;
        struct rcar_can_priv *priv;
        struct net_device *ndev;
        void __iomem *addr;
@@ -745,7 +746,7 @@ static int rcar_can_probe(struct platform_device *pdev)
        int err = -ENODEV;
        int irq;
 
-       of_property_read_u32(pdev->dev.of_node, "renesas,can-clock-select",
+       of_property_read_u32(dev->of_node, "renesas,can-clock-select",
                             &clock_select);
 
        irq = platform_get_irq(pdev, 0);
@@ -762,30 +763,29 @@ static int rcar_can_probe(struct platform_device *pdev)
 
        ndev = alloc_candev(sizeof(struct rcar_can_priv), RCAR_CAN_FIFO_DEPTH);
        if (!ndev) {
-               dev_err(&pdev->dev, "alloc_candev() failed\n");
+               dev_err(dev, "alloc_candev() failed\n");
                err = -ENOMEM;
                goto fail;
        }
 
        priv = netdev_priv(ndev);
 
-       priv->clk = devm_clk_get(&pdev->dev, "clkp1");
+       priv->clk = devm_clk_get(dev, "clkp1");
        if (IS_ERR(priv->clk)) {
                err = PTR_ERR(priv->clk);
-               dev_err(&pdev->dev, "cannot get peripheral clock, error %d\n",
-                       err);
+               dev_err(dev, "cannot get peripheral clock, error %d\n", err);
                goto fail_clk;
        }
 
        if (!(BIT(clock_select) & RCAR_SUPPORTED_CLOCKS)) {
                err = -EINVAL;
-               dev_err(&pdev->dev, "invalid CAN clock selected\n");
+               dev_err(dev, "invalid CAN clock selected\n");
                goto fail_clk;
        }
-       priv->can_clk = devm_clk_get(&pdev->dev, clock_names[clock_select]);
+       priv->can_clk = devm_clk_get(dev, clock_names[clock_select]);
        if (IS_ERR(priv->can_clk)) {
                err = PTR_ERR(priv->can_clk);
-               dev_err(&pdev->dev, "cannot get CAN clock, error %d\n", err);
+               dev_err(dev, "cannot get CAN clock, error %d\n", err);
                goto fail_clk;
        }
 
@@ -802,18 +802,17 @@ static int rcar_can_probe(struct platform_device *pdev)
        priv->can.do_get_berr_counter = rcar_can_get_berr_counter;
        priv->can.ctrlmode_supported = CAN_CTRLMODE_BERR_REPORTING;
        platform_set_drvdata(pdev, ndev);
-       SET_NETDEV_DEV(ndev, &pdev->dev);
+       SET_NETDEV_DEV(ndev, dev);
 
        netif_napi_add_weight(ndev, &priv->napi, rcar_can_rx_poll,
                              RCAR_CAN_NAPI_WEIGHT);
        err = register_candev(ndev);
        if (err) {
-               dev_err(&pdev->dev, "register_candev() failed, error %d\n",
-                       err);
+               dev_err(dev, "register_candev() failed, error %d\n", err);
                goto fail_candev;
        }
 
-       dev_info(&pdev->dev, "device registered (IRQ%d)\n", ndev->irq);
+       dev_info(dev, "device registered (IRQ%d)\n", ndev->irq);
 
        return 0;
 fail_candev: