Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 294124
b: refs/heads/master
c: cfda62b
h: refs/heads/master
v: v3
  • Loading branch information
Stefan Richter committed Mar 10, 2012
1 parent f1cb014 commit 08991b4
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 25 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 98466cc4502b3171f1bdc146db0d2106fcbc3f4f
refs/heads/master: cfda62baa474b194802a555d3f7f2ccfa27e28bb
5 changes: 0 additions & 5 deletions trunk/drivers/firewire/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ config FIREWIRE_OHCI
To compile this driver as a module, say M here: The module will be
called firewire-ohci.

config FIREWIRE_OHCI_DEBUG
bool
depends on FIREWIRE_OHCI
default y

config FIREWIRE_SBP2
tristate "Storage devices (SBP-2 protocol)"
depends on FIREWIRE && SCSI
Expand Down
20 changes: 1 addition & 19 deletions trunk/drivers/firewire/ohci.c
Original file line number Diff line number Diff line change
Expand Up @@ -334,8 +334,6 @@ MODULE_PARM_DESC(quirks, "Chip quirks (default = 0"
#define OHCI_PARAM_DEBUG_IRQS 4
#define OHCI_PARAM_DEBUG_BUSRESETS 8 /* only effective before chip init */

#ifdef CONFIG_FIREWIRE_OHCI_DEBUG

static int param_debug;
module_param_named(debug, param_debug, int, 0644);
MODULE_PARM_DESC(debug, "Verbose logging (default = 0"
Expand Down Expand Up @@ -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)
{
writel(data, ohci->registers + offset);
Expand Down Expand Up @@ -1636,17 +1625,10 @@ static void detect_dead_context(struct fw_ohci *ohci,
u32 ctl;

ctl = reg_read(ohci, CONTROL_SET(regs));
if (ctl & CONTEXT_DEAD) {
#ifdef CONFIG_FIREWIRE_OHCI_DEBUG
if (ctl & CONTEXT_DEAD)
dev_err(ohci->card.device,
"DMA context %s has stopped, error code: %s\n",
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)
Expand Down

0 comments on commit 08991b4

Please sign in to comment.