Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 284656
b: refs/heads/master
c: 8487bfd
h: refs/heads/master
v: v3
  • Loading branch information
Jim Cromie authored and Rusty Russell committed Jan 12, 2012
1 parent bdd7d69 commit 2c1958b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 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: 5e12416927975aa3c58394cea15db6c3e488a033
refs/heads/master: 8487bfd954928660a52e91384a9b1f1049217e35
14 changes: 4 additions & 10 deletions trunk/kernel/params.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@
#include <linux/slab.h>
#include <linux/ctype.h>

#if 0
#define DEBUGP printk
#else
#define DEBUGP(fmt, a...)
#endif

/* Protects all parameters, and incidentally kmalloced_param list. */
static DEFINE_MUTEX(param_lock);

Expand Down Expand Up @@ -105,7 +99,7 @@ static int parse_one(char *param,
/* No one handled NULL, so do it here. */
if (!val && params[i].ops->set != param_set_bool)
return -EINVAL;
DEBUGP("They are equal! Calling %p\n",
pr_debug("They are equal! Calling %p\n",
params[i].ops->set);
mutex_lock(&param_lock);
err = params[i].ops->set(val, &params[i]);
Expand All @@ -115,11 +109,11 @@ static int parse_one(char *param,
}

if (handle_unknown) {
DEBUGP("Unknown argument: calling %p\n", handle_unknown);
pr_debug("Unknown argument: calling %p\n", handle_unknown);
return handle_unknown(param, val);
}

DEBUGP("Unknown argument `%s'\n", param);
pr_debug("Unknown argument `%s'\n", param);
return -ENOENT;
}

Expand Down Expand Up @@ -184,7 +178,7 @@ int parse_args(const char *name,
{
char *param, *val;

DEBUGP("Parsing ARGS: %s\n", args);
pr_debug("Parsing ARGS: %s\n", args);

/* Chew leading spaces */
args = skip_spaces(args);
Expand Down

0 comments on commit 2c1958b

Please sign in to comment.