sugar/linux
1
0
Fork 0
Code Activity

firewire: ohci: move runtime debug facility out of #ifdef

Browse Source 
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>
This commit is contained in:
Stefan Richter
2012-03-04 21:34:21 +01:00
parent 98466cc450
commit cfda62baa4
2 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/firewire/Kconfig
View File

@@ -28,11 +28,6 @@ config FIREWIRE_OHCI
To compile this driver as a module, say M here: The module will be To compile this driver as a module, say M here: The module will be
called firewire-ohci. called firewire-ohci.
config FIREWIRE_OHCI_DEBUG
bool
depends on FIREWIRE_OHCI
default y
config FIREWIRE_SBP2 config FIREWIRE_SBP2
tristate "Storage devices (SBP-2 protocol)" tristate "Storage devices (SBP-2 protocol)"
depends on FIREWIRE && SCSI depends on FIREWIRE && SCSI

20
drivers/firewire/ohci.c
View File

@@ -334,8 +334,6 @@ MODULE_PARM_DESC(quirks, "Chip quirks (default = 0"
#define OHCI_PARAM_DEBUG_IRQS 4 #define OHCI_PARAM_DEBUG_IRQS 4
#define OHCI_PARAM_DEBUG_BUSRESETS 8 /* only effective before chip init */ #define OHCI_PARAM_DEBUG_BUSRESETS 8 /* only effective before chip init */
#ifdef CONFIG_FIREWIRE_OHCI_DEBUG
static int param_debug; static int param_debug;
module_param_named(debug, param_debug, int, 0644); module_param_named(debug, param_debug, int, 0644);
MODULE_PARM_DESC(debug, "Verbose logging (default = 0" MODULE_PARM_DESC(debug, "Verbose logging (default = 0"
@@ -516,15 +514,6 @@ static void log_ar_at_event(struct fw_ohci *ohci,
} }
} }
#else
#define param_debug 0
static inline void log_irqs(struct fw_ohci *ohci, u32 evt) {}
static inline void log_selfids(struct fw_ohci *ohci, int generation, int self_id_count) {}
static inline void log_ar_at_event(struct fw_ohci *ohci, char dir, int speed, u32 *header, int evt) {}
#endif /* CONFIG_FIREWIRE_OHCI_DEBUG */
static inline void reg_write(const struct fw_ohci *ohci, int offset, u32 data) static inline void reg_write(const struct fw_ohci *ohci, int offset, u32 data)
{ {
writel(data, ohci->registers + offset); writel(data, ohci->registers + offset);
@@ -1636,17 +1625,10 @@ static void detect_dead_context(struct fw_ohci *ohci,
u32 ctl; u32 ctl;
ctl = reg_read(ohci, CONTROL_SET(regs)); ctl = reg_read(ohci, CONTROL_SET(regs));
if (ctl & CONTEXT_DEAD) { if (ctl & CONTEXT_DEAD)
#ifdef CONFIG_FIREWIRE_OHCI_DEBUG
dev_err(ohci->card.device, dev_err(ohci->card.device,
"DMA context %s has stopped, error code: %s\n", "DMA context %s has stopped, error code: %s\n",
name, evts[ctl & 0x1f]); name, evts[ctl & 0x1f]);
#else
dev_err(ohci->card.device,
"DMA context %s has stopped, error code: %#x\n",
name, ctl & 0x1f);
#endif
}
} }
static void handle_dead_contexts(struct fw_ohci *ohci) static void handle_dead_contexts(struct fw_ohci *ohci)