Skip to content

Commit 4237430

Browse files
committed
firewire: ohci: obsolete OHCI_PARAM_DEBUG_BUSRESETS from debug module parameter
The OHCI_PARAM_DEBUG_BUSRESETS bit of debug module parameter was added at a commit a007bb8 ("firewire: fw-ohci: conditionally log busReset interrupts"). At the former commit, the bit becomes less meaningful, just to skip logging. This commit obsoletes it. Link: https://lore.kernel.org/r/20240501073238.72769-3-o-takashi@sakamocchi.jp Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
1 parent 0d12f09 commit 4237430

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

drivers/firewire/ohci.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -394,15 +394,13 @@ MODULE_PARM_DESC(quirks, "Chip quirks (default = 0"
394394
#define OHCI_PARAM_DEBUG_AT_AR 1
395395
#define OHCI_PARAM_DEBUG_SELFIDS 2
396396
#define OHCI_PARAM_DEBUG_IRQS 4
397-
#define OHCI_PARAM_DEBUG_BUSRESETS 8
398397

399398
static int param_debug;
400399
module_param_named(debug, param_debug, int, 0644);
401400
MODULE_PARM_DESC(debug, "Verbose logging (default = 0"
402401
", AT/AR events = " __stringify(OHCI_PARAM_DEBUG_AT_AR)
403402
", self-IDs = " __stringify(OHCI_PARAM_DEBUG_SELFIDS)
404403
", IRQs = " __stringify(OHCI_PARAM_DEBUG_IRQS)
405-
", busReset events = " __stringify(OHCI_PARAM_DEBUG_BUSRESETS)
406404
", or a combination, or all = -1)");
407405

408406
static bool param_remote_dma;
@@ -411,12 +409,7 @@ MODULE_PARM_DESC(remote_dma, "Enable unfiltered remote DMA (default = N)");
411409

412410
static void log_irqs(struct fw_ohci *ohci, u32 evt)
413411
{
414-
if (likely(!(param_debug &
415-
(OHCI_PARAM_DEBUG_IRQS | OHCI_PARAM_DEBUG_BUSRESETS))))
416-
return;
417-
418-
if (!(param_debug & OHCI_PARAM_DEBUG_IRQS) &&
419-
!(evt & OHCI1394_busReset))
412+
if (likely(!(param_debug & OHCI_PARAM_DEBUG_IRQS)))
420413
return;
421414

422415
ohci_notice(ohci, "IRQ %08x%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", evt,

0 commit comments

Comments
 (0)