Commit e00d33cb authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Greg Kroah-Hartman

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

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: default avatarStefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e5603cbd
...@@ -412,10 +412,8 @@ static void line6_data_received(struct urb *urb) ...@@ -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 (;;) {
......
...@@ -252,25 +252,19 @@ void line6_pod_process_message(struct usb_line6_pod *pod) ...@@ -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-> "unknown dump code %02X\n",
line6.ifcdev, pod->dumpreq.in_progress);
"unknown dump code %02X\n",
pod->
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->line6.message_length,
pod-> (int)sizeof(pod->prog_data) +
line6.message_length, 7);
(int)
sizeof(pod->prog_data) +
7));
break; break;
...@@ -302,11 +296,9 @@ void line6_pod_process_message(struct usb_line6_pod *pod) ...@@ -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-> "unknown tuner/system response %02X\n",
line6.ifcdev, buf[6]);
"unknown tuner/system response %02X\n",
buf[6]));
} }
break; break;
...@@ -321,25 +313,21 @@ void line6_pod_process_message(struct usb_line6_pod *pod) ...@@ -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) ...@@ -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) ...@@ -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]));
} }
} }
......
...@@ -262,10 +262,9 @@ void line6_variax_process_message(struct usb_line6_variax *variax) ...@@ -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) ...@@ -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]));
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment