]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
firewire: ohci: obsolete direct usage of printk_ratelimit()
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Tue, 3 Sep 2024 10:15:23 +0000 (19:15 +0900)
committerTakashi Sakamoto <o-takashi@sakamocchi.jp>
Tue, 3 Sep 2024 10:15:23 +0000 (19:15 +0900)
A commit 77006a0a8282 ("ratelimit: add comment warning people off
printk_ratelimit()") has already deprecated printk_ratelimit().

This commit uses alternative functions to obsolete its usage.

Link: https://lore.kernel.org/r/20240903101523.317110-1-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
drivers/firewire/ohci.c

index e662dc30c21f46c5345f215035eac25820594859..3930fdd561552cf6add7ffa4a5233c909fd3883d 100644 (file)
@@ -2268,13 +2268,11 @@ static irqreturn_t irq_handler(int irq, void *data)
                reg_read(ohci, OHCI1394_PostedWriteAddressLo);
                reg_write(ohci, OHCI1394_IntEventClear,
                          OHCI1394_postedWriteErr);
-               if (printk_ratelimit())
-                       ohci_err(ohci, "PCI posted write error\n");
+               dev_err_ratelimited(ohci->card.device, "PCI posted write error\n");
        }
 
        if (unlikely(event & OHCI1394_cycleTooLong)) {
-               if (printk_ratelimit())
-                       ohci_notice(ohci, "isochronous cycle too long\n");
+               dev_notice_ratelimited(ohci->card.device, "isochronous cycle too long\n");
                reg_write(ohci, OHCI1394_LinkControlSet,
                          OHCI1394_LinkControl_cycleMaster);
        }
@@ -2286,8 +2284,7 @@ static irqreturn_t irq_handler(int irq, void *data)
                 * stop active cycleMatch iso contexts now and restart
                 * them at least two cycles later.  (FIXME?)
                 */
-               if (printk_ratelimit())
-                       ohci_notice(ohci, "isochronous cycle inconsistent\n");
+               dev_notice_ratelimited(ohci->card.device, "isochronous cycle inconsistent\n");
        }
 
        if (unlikely(event & OHCI1394_unrecoverableError))