From: Takashi Sakamoto Date: Tue, 3 Sep 2024 10:15:23 +0000 (+0900) Subject: firewire: ohci: obsolete direct usage of printk_ratelimit() X-Git-Tag: v6.12-rc1~95^2~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7d35a0060392af796cc4e08780d7b71d1fc71e5e;p=thirdparty%2Fkernel%2Flinux.git firewire: ohci: obsolete direct usage of printk_ratelimit() 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 --- diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index e662dc30c21f4..3930fdd561552 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c @@ -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))