[PATCH 3/3] firewire: ohci: fix nonstandard build without debugfacility

From: Stefan Richter
Date: Fri Apr 02 2010 - 08:06:52 EST


CONFIG_FIREWIRE_OHCI_DEBUG is currently a hidden kconfig variable, hence
is not going to be switched off by anybody. Still, it can be switched
off but then compilation will fail in ohci_enable() at the expression
param_debug & OHCI_PARAM_DEBUG_BUSRESETS.

Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
---
drivers/firewire/ohci.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Index: b/drivers/firewire/ohci.c
===================================================================
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -259,13 +259,13 @@ MODULE_PARM_DESC(quirks, "Chip quirks (d
", AR/selfID endianess = " __stringify(QUIRK_BE_HEADERS)
")");

-#ifdef CONFIG_FIREWIRE_OHCI_DEBUG
-
#define OHCI_PARAM_DEBUG_AT_AR 1
#define OHCI_PARAM_DEBUG_SELFIDS 2
#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"
@@ -438,6 +438,7 @@ static void log_ar_at_event(char dir, in

#else

+#define param_debug 0
static inline void log_irqs(u32 evt) {}
static inline void log_selfids(int node_id, int generation, int self_id_count, u32 *s) {}
static inline void log_ar_at_event(char dir, int speed, u32 *header, int evt) {}

--
Stefan Richter
-=====-==-=- -=-- ---=-
http://arcgraph.de/sr/

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/