aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2012-03-04 15:34:21 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2012-03-10 11:41:19 -0500
commitcfda62baa474b194802a555d3f7f2ccfa27e28bb (patch)
treebab66039c764ffb9a568e5356edd001fbb3210dd /drivers
parent98466cc4502b3171f1bdc146db0d2106fcbc3f4f (diff)
firewire: ohci: move runtime debug facility out of #ifdef
CONFIG_FIREWIRE_OHCI_DEBUG could have been exposed to kernel tweakers if CONFIG_EXPERT was set. But in hindsight, this stuff is far too useful to omit it. So get rid of two #else branches that are only going to bitrot otherwise. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/firewire/Kconfig5
-rw-r--r--drivers/firewire/ohci.c20
2 files changed, 1 insertions, 24 deletions
diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index 2be6f4520772..7224533e8ca6 100644
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -28,11 +28,6 @@ config FIREWIRE_OHCI
28 To compile this driver as a module, say M here: The module will be 28 To compile this driver as a module, say M here: The module will be
29 called firewire-ohci. 29 called firewire-ohci.
30 30
31config FIREWIRE_OHCI_DEBUG
32 bool
33 depends on FIREWIRE_OHCI
34 default y
35
36config FIREWIRE_SBP2 31config FIREWIRE_SBP2
37 tristate "Storage devices (SBP-2 protocol)" 32 tristate "Storage devices (SBP-2 protocol)"
38 depends on FIREWIRE && SCSI 33 depends on FIREWIRE && SCSI
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index ee235b537774..384b5b08126c 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -334,8 +334,6 @@ MODULE_PARM_DESC(quirks, "Chip quirks (default = 0"
334#define OHCI_PARAM_DEBUG_IRQS 4 334#define OHCI_PARAM_DEBUG_IRQS 4
335#define OHCI_PARAM_DEBUG_BUSRESETS 8 /* only effective before chip init */ 335#define OHCI_PARAM_DEBUG_BUSRESETS 8 /* only effective before chip init */
336 336
337#ifdef CONFIG_FIREWIRE_OHCI_DEBUG
338
339static int param_debug; 337static int param_debug;
340module_param_named(debug, param_debug, int, 0644); 338module_param_named(debug, param_debug, int, 0644);
341MODULE_PARM_DESC(debug, "Verbose logging (default = 0" 339MODULE_PARM_DESC(debug, "Verbose logging (default = 0"
@@ -516,15 +514,6 @@ static void log_ar_at_event(struct fw_ohci *ohci,
516 } 514 }
517} 515}
518 516
519#else
520
521#define param_debug 0
522static inline void log_irqs(struct fw_ohci *ohci, u32 evt) {}
523static inline void log_selfids(struct fw_ohci *ohci, int generation, int self_id_count) {}
524static inline void log_ar_at_event(struct fw_ohci *ohci, char dir, int speed, u32 *header, int evt) {}
525
526#endif /* CONFIG_FIREWIRE_OHCI_DEBUG */
527
528static inline void reg_write(const struct fw_ohci *ohci, int offset, u32 data) 517static inline void reg_write(const struct fw_ohci *ohci, int offset, u32 data)
529{ 518{
530 writel(data, ohci->registers + offset); 519 writel(data, ohci->registers + offset);
@@ -1636,17 +1625,10 @@ static void detect_dead_context(struct fw_ohci *ohci,
1636 u32 ctl; 1625 u32 ctl;
1637 1626
1638 ctl = reg_read(ohci, CONTROL_SET(regs)); 1627 ctl = reg_read(ohci, CONTROL_SET(regs));
1639 if (ctl & CONTEXT_DEAD) { 1628 if (ctl & CONTEXT_DEAD)
1640#ifdef CONFIG_FIREWIRE_OHCI_DEBUG
1641 dev_err(ohci->card.device, 1629 dev_err(ohci->card.device,
1642 "DMA context %s has stopped, error code: %s\n", 1630 "DMA context %s has stopped, error code: %s\n",
1643 name, evts[ctl & 0x1f]); 1631 name, evts[ctl & 0x1f]);
1644#else
1645 dev_err(ohci->card.device,
1646 "DMA context %s has stopped, error code: %#x\n",
1647 name, ctl & 0x1f);
1648#endif
1649 }
1650} 1632}
1651 1633
1652static void handle_dead_contexts(struct fw_ohci *ohci) 1634static void handle_dead_contexts(struct fw_ohci *ohci)