]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: m_can: convert dev_{dbg,info,err} -> netdev_{dbg,info,err}
authorMarc Kleine-Budde <mkl@pengutronix.de>
Fri, 8 Aug 2025 12:14:55 +0000 (14:14 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Fri, 17 Oct 2025 13:16:59 +0000 (15:16 +0200)
To ease debugging use the netdev_{dbg,info,err}() functions instead of
dev_{dbg,info,err}.

Link: https://patch.msgid.link/20251008-m_can-cleanups-v1-3-1784a18eaa84@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/m_can/m_can.c

index 110cfd54b66950aa6c2828dc99b6c438bf1032e8..6aef5e771fc32d3ba5e641b00b1805cb60def19b 100644 (file)
@@ -387,8 +387,8 @@ static int m_can_cccr_update_bits(struct m_can_classdev *cdev, u32 mask, u32 val
        size_t tries = 10;
 
        if (!(mask & CCCR_INIT) && !(val_before & CCCR_INIT)) {
-               dev_err(cdev->dev,
-                       "refusing to configure device when in normal mode\n");
+               netdev_err(cdev->net,
+                          "refusing to configure device when in normal mode\n");
                return -EBUSY;
        }
 
@@ -470,7 +470,7 @@ static void m_can_coalescing_disable(struct m_can_classdev *cdev)
 static inline void m_can_enable_all_interrupts(struct m_can_classdev *cdev)
 {
        if (!cdev->net->irq) {
-               dev_dbg(cdev->dev, "Start hrtimer\n");
+               netdev_dbg(cdev->net, "Start hrtimer\n");
                hrtimer_start(&cdev->hrtimer,
                              ms_to_ktime(HRTIMER_POLL_INTERVAL_MS),
                              HRTIMER_MODE_REL_PINNED);
@@ -486,7 +486,7 @@ static inline void m_can_disable_all_interrupts(struct m_can_classdev *cdev)
        m_can_write(cdev, M_CAN_ILE, 0x0);
 
        if (!cdev->net->irq) {
-               dev_dbg(cdev->dev, "Stop hrtimer\n");
+               netdev_dbg(cdev->net, "Stop hrtimer\n");
                hrtimer_try_to_cancel(&cdev->hrtimer);
        }
 }
@@ -1486,7 +1486,7 @@ static int m_can_chip_config(struct net_device *dev)
 
        err = m_can_init_ram(cdev);
        if (err) {
-               dev_err(cdev->dev, "Message RAM configuration failed\n");
+               netdev_err(dev, "Message RAM configuration failed\n");
                return err;
        }
 
@@ -1716,7 +1716,7 @@ static int m_can_niso_supported(struct m_can_classdev *cdev)
        /* Then clear the it again. */
        ret = m_can_cccr_update_bits(cdev, CCCR_NISO, 0);
        if (ret) {
-               dev_err(cdev->dev, "failed to revert the NON-ISO bit in CCCR\n");
+               netdev_err(cdev->net, "failed to revert the NON-ISO bit in CCCR\n");
                return ret;
        }
 
@@ -1735,8 +1735,8 @@ static int m_can_dev_setup(struct m_can_classdev *cdev)
        m_can_version = m_can_check_core_release(cdev);
        /* return if unsupported version */
        if (!m_can_version) {
-               dev_err(cdev->dev, "Unsupported version number: %2d",
-                       m_can_version);
+               netdev_err(cdev->net, "Unsupported version number: %2d",
+                          m_can_version);
                return -EINVAL;
        }
 
@@ -1794,8 +1794,8 @@ static int m_can_dev_setup(struct m_can_classdev *cdev)
                        cdev->can.ctrlmode_supported |= CAN_CTRLMODE_FD_NON_ISO;
                break;
        default:
-               dev_err(cdev->dev, "Unsupported version number: %2d",
-                       cdev->version);
+               netdev_err(cdev->net, "Unsupported version number: %2d",
+                          cdev->version);
                return -EINVAL;
        }
 
@@ -2348,8 +2348,8 @@ int m_can_check_mram_cfg(struct m_can_classdev *cdev, u32 mram_max_size)
        total_size = cdev->mcfg[MRAM_TXB].off - cdev->mcfg[MRAM_SIDF].off +
                        cdev->mcfg[MRAM_TXB].num * TXB_ELEMENT_SIZE;
        if (total_size > mram_max_size) {
-               dev_err(cdev->dev, "Total size of mram config(%u) exceeds mram(%u)\n",
-                       total_size, mram_max_size);
+               netdev_err(cdev->net, "Total size of mram config(%u) exceeds mram(%u)\n",
+                          total_size, mram_max_size);
                return -EINVAL;
        }
 
@@ -2384,15 +2384,15 @@ static void m_can_of_parse_mram(struct m_can_classdev *cdev,
        cdev->mcfg[MRAM_TXB].num = mram_config_vals[7] &
                FIELD_MAX(TXBC_NDTB_MASK);
 
-       dev_dbg(cdev->dev,
-               "sidf 0x%x %d xidf 0x%x %d rxf0 0x%x %d rxf1 0x%x %d rxb 0x%x %d txe 0x%x %d txb 0x%x %d\n",
-               cdev->mcfg[MRAM_SIDF].off, cdev->mcfg[MRAM_SIDF].num,
-               cdev->mcfg[MRAM_XIDF].off, cdev->mcfg[MRAM_XIDF].num,
-               cdev->mcfg[MRAM_RXF0].off, cdev->mcfg[MRAM_RXF0].num,
-               cdev->mcfg[MRAM_RXF1].off, cdev->mcfg[MRAM_RXF1].num,
-               cdev->mcfg[MRAM_RXB].off, cdev->mcfg[MRAM_RXB].num,
-               cdev->mcfg[MRAM_TXE].off, cdev->mcfg[MRAM_TXE].num,
-               cdev->mcfg[MRAM_TXB].off, cdev->mcfg[MRAM_TXB].num);
+       netdev_dbg(cdev->net,
+                  "sidf 0x%x %d xidf 0x%x %d rxf0 0x%x %d rxf1 0x%x %d rxb 0x%x %d txe 0x%x %d txb 0x%x %d\n",
+                  cdev->mcfg[MRAM_SIDF].off, cdev->mcfg[MRAM_SIDF].num,
+                  cdev->mcfg[MRAM_XIDF].off, cdev->mcfg[MRAM_XIDF].num,
+                  cdev->mcfg[MRAM_RXF0].off, cdev->mcfg[MRAM_RXF0].num,
+                  cdev->mcfg[MRAM_RXF1].off, cdev->mcfg[MRAM_RXF1].num,
+                  cdev->mcfg[MRAM_RXB].off, cdev->mcfg[MRAM_RXB].num,
+                  cdev->mcfg[MRAM_TXE].off, cdev->mcfg[MRAM_TXE].num,
+                  cdev->mcfg[MRAM_TXB].off, cdev->mcfg[MRAM_TXB].num);
 }
 
 int m_can_class_get_clocks(struct m_can_classdev *cdev)
@@ -2403,7 +2403,7 @@ int m_can_class_get_clocks(struct m_can_classdev *cdev)
        cdev->cclk = devm_clk_get(cdev->dev, "cclk");
 
        if (IS_ERR(cdev->hclk) || IS_ERR(cdev->cclk)) {
-               dev_err(cdev->dev, "no clock found\n");
+               netdev_err(cdev->net, "no clock found\n");
                ret = -ENODEV;
        }
 
@@ -2544,7 +2544,7 @@ int m_can_class_register(struct m_can_classdev *cdev)
        }
 
        if (!cdev->net->irq) {
-               dev_dbg(cdev->dev, "Polling enabled, initialize hrtimer");
+               netdev_dbg(cdev->net, "Polling enabled, initialize hrtimer");
                hrtimer_setup(&cdev->hrtimer, m_can_polling_timer, CLOCK_MONOTONIC,
                              HRTIMER_MODE_REL_PINNED);
        } else {
@@ -2558,15 +2558,15 @@ int m_can_class_register(struct m_can_classdev *cdev)
 
        ret = register_m_can_dev(cdev);
        if (ret) {
-               dev_err(cdev->dev, "registering %s failed (err=%d)\n",
-                       cdev->net->name, ret);
+               netdev_err(cdev->net, "registering %s failed (err=%d)\n",
+                          cdev->net->name, ret);
                goto rx_offload_del;
        }
 
        of_can_transceiver(cdev->net);
 
-       dev_info(cdev->dev, "%s device registered (irq=%d, version=%d)\n",
-                KBUILD_MODNAME, cdev->net->irq, cdev->version);
+       netdev_info(cdev->net, "device registered (irq=%d, version=%d)\n",
+                   cdev->net->irq, cdev->version);
 
        /* Probe finished
         * Assert reset and stop clocks.