iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: line6: replace DEBUG_MESSAGES() with dev_dbg()

Browse Source 
The dyndbg feature allows dev_dbg() calls to be enabled/disabled at
runtime and is therefore more convenient than static debug log messages.
Use dev_dbg() instead of the line6-specific DEBUG_MESSAGES() macro.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Stefan Hajnoczi 2012-11-11 13:52:24 +01:00 committed by Greg Kroah-Hartman
parent e5603cbd7f
commit e00d33cb5d
3 changed files with 28 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/line6/driver.c
View File

@ -412,10 +412,8 @@ static void line6_data_received(struct urb *urb)
if (done < urb->actual_length) { if (done < urb->actual_length) {
line6_midibuf_ignore(mb, done); line6_midibuf_ignore(mb, done);
DEBUG_MESSAGES(dev_err dev_dbg(line6->ifcdev, "%d %d buffer overflow - message skipped\n",
(line6->ifcdev, done, urb->actual_length);
"%d %d buffer overflow - message skipped\n",
done, urb->actual_length));
} }
for (;;) { for (;;) {

47
drivers/staging/line6/pod.c
View File

@ -252,25 +252,19 @@ void line6_pod_process_message(struct usb_line6_pod *pod)
break; break;
default: default:
DEBUG_MESSAGES(dev_err dev_dbg(pod->line6.ifcdev,
(pod->
line6.ifcdev,
"unknown dump code %02X\n", "unknown dump code %02X\n",
pod-> pod->dumpreq.in_progress);
dumpreq.in_progress));
} }
line6_dump_finished(&pod->dumpreq); line6_dump_finished(&pod->dumpreq);
pod_startup3(pod); pod_startup3(pod);
} else } else
DEBUG_MESSAGES(dev_err dev_dbg(pod->line6.ifcdev,
(pod->line6.ifcdev,
"wrong size of channel dump message (%d instead of %d)\n", "wrong size of channel dump message (%d instead of %d)\n",
pod-> pod->line6.message_length,
line6.message_length, (int)sizeof(pod->prog_data) +
(int) 7);
sizeof(pod->prog_data) +
7));
break; break;
@ -302,11 +296,9 @@ void line6_pod_process_message(struct usb_line6_pod *pod)
#undef PROCESS_SYSTEM_PARAM #undef PROCESS_SYSTEM_PARAM
default: default:
DEBUG_MESSAGES(dev_err dev_dbg(pod->line6.ifcdev,
(pod->
line6.ifcdev,
"unknown tuner/system response %02X\n", "unknown tuner/system response %02X\n",
buf[6])); buf[6]);
} }
break; break;
@ -321,25 +313,21 @@ void line6_pod_process_message(struct usb_line6_pod *pod)
break; break;
case POD_SYSEX_CLIP: case POD_SYSEX_CLIP:
DEBUG_MESSAGES(dev_err dev_dbg(pod->line6.ifcdev, "audio clipped\n");
(pod->line6.ifcdev,
"audio clipped\n"));
pod->clipping.value = 1; pod->clipping.value = 1;
wake_up(&pod->clipping.wait); wake_up(&pod->clipping.wait);
break; break;
case POD_SYSEX_STORE: case POD_SYSEX_STORE:
DEBUG_MESSAGES(dev_err dev_dbg(pod->line6.ifcdev,
(pod->line6.ifcdev,
"message %02X not yet implemented\n", "message %02X not yet implemented\n",
buf[5])); buf[5]);
break; break;
default: default:
DEBUG_MESSAGES(dev_err dev_dbg(pod->line6.ifcdev,
(pod->line6.ifcdev,
"unknown sysex message %02X\n", "unknown sysex message %02X\n",
buf[5])); buf[5]);
} }
} else } else
if (memcmp if (memcmp
@ -352,9 +340,7 @@ void line6_pod_process_message(struct usb_line6_pod *pod)
buf[10]; buf[10];
pod_startup4(pod); pod_startup4(pod);
} else } else
DEBUG_MESSAGES(dev_err dev_dbg(pod->line6.ifcdev, "unknown sysex header\n");
(pod->line6.ifcdev,
"unknown sysex header\n"));
break; break;
@ -362,9 +348,8 @@ void line6_pod_process_message(struct usb_line6_pod *pod)
break; break;
default: default:
DEBUG_MESSAGES(dev_err dev_dbg(pod->line6.ifcdev, "POD: unknown message %02X\n",
(pod->line6.ifcdev, buf[0]);
"POD: unknown message %02X\n", buf[0]));
} }
} }

10
drivers/staging/line6/variax.c
View File

@ -262,10 +262,9 @@ void line6_variax_process_message(struct usb_line6_variax *variax)
2, VARIAX_DUMP_PASS3); 2, VARIAX_DUMP_PASS3);
} }
} else { } else {
DEBUG_MESSAGES(dev_err dev_dbg(variax->line6.ifcdev,
(variax->line6.ifcdev,
"illegal length %d of model data\n", "illegal length %d of model data\n",
variax->line6.message_length)); variax->line6.message_length);
line6_dump_finished(&variax->dumpreq); line6_dump_finished(&variax->dumpreq);
} }
} else if (memcmp(buf + 1, variax_request_bank + 1, } else if (memcmp(buf + 1, variax_request_bank + 1,
@ -295,9 +294,8 @@ void line6_variax_process_message(struct usb_line6_variax *variax)
break; break;
default: default:
DEBUG_MESSAGES(dev_err dev_dbg(variax->line6.ifcdev,
(variax->line6.ifcdev, "Variax: unknown message %02X\n", buf[0]);
"Variax: unknown message %02X\n", buf[0]));
} }
} }