Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/line6/driver.c

+2 −4
Original line number Diff line number Diff line
@@ -412,10 +412,8 @@ static void line6_data_received(struct urb *urb) 


	if (done < urb->actual_length) {

		line6_midibuf_ignore(mb, done);

		DEBUG_MESSAGES(dev_err

			       (line6->ifcdev,

				"%d %d buffer overflow - message skipped\n",

				done, urb->actual_length));

		dev_dbg(line6->ifcdev, "%d %d buffer overflow - message skipped\n",

			done, urb->actual_length);

	}



	for (;;) {

drivers/staging/line6/pod.c

+21 −36
Original line number Diff line number Diff line
@@ -252,25 +252,19 @@ void line6_pod_process_message(struct usb_line6_pod *pod) 
						break;



					default:

						DEBUG_MESSAGES(dev_err

							       (pod->

								line6.ifcdev,

						dev_dbg(pod->line6.ifcdev,

							"unknown dump code %02X\n",

								pod->

								dumpreq.in_progress));

							pod->dumpreq.in_progress);

					}



					line6_dump_finished(&pod->dumpreq);

					pod_startup3(pod);

				} else

					DEBUG_MESSAGES(dev_err

						       (pod->line6.ifcdev,

					dev_dbg(pod->line6.ifcdev,

						"wrong size of channel dump message (%d instead of %d)\n",

							pod->

							line6.message_length,

							(int)

							sizeof(pod->prog_data) +

							7));

						pod->line6.message_length,

						(int)sizeof(pod->prog_data) +

						7);



				break;
@@ -302,11 +296,9 @@ void line6_pod_process_message(struct usb_line6_pod *pod) 
#undef PROCESS_SYSTEM_PARAM



					default:

						DEBUG_MESSAGES(dev_err

							       (pod->

								line6.ifcdev,

						dev_dbg(pod->line6.ifcdev,

							"unknown tuner/system response %02X\n",

								buf[6]));

							buf[6]);

					}



					break;
@@ -321,25 +313,21 @@ void line6_pod_process_message(struct usb_line6_pod *pod) 
				break;



			case POD_SYSEX_CLIP:

				DEBUG_MESSAGES(dev_err

					       (pod->line6.ifcdev,

						"audio clipped\n"));

				dev_dbg(pod->line6.ifcdev, "audio clipped\n");

				pod->clipping.value = 1;

				wake_up(&pod->clipping.wait);

				break;



			case POD_SYSEX_STORE:

				DEBUG_MESSAGES(dev_err

					       (pod->line6.ifcdev,

				dev_dbg(pod->line6.ifcdev,

					"message %02X not yet implemented\n",

						buf[5]));

					buf[5]);

				break;



			default:

				DEBUG_MESSAGES(dev_err

					       (pod->line6.ifcdev,

				dev_dbg(pod->line6.ifcdev,

					"unknown sysex message %02X\n",

						buf[5]));

					buf[5]);

			}

		} else

		    if (memcmp
@@ -352,9 +340,7 @@ void line6_pod_process_message(struct usb_line6_pod *pod) 
			    buf[10];

			pod_startup4(pod);

		} else

			DEBUG_MESSAGES(dev_err

				       (pod->line6.ifcdev,

					"unknown sysex header\n"));

			dev_dbg(pod->line6.ifcdev, "unknown sysex header\n");



		break;
@@ -362,9 +348,8 @@ void line6_pod_process_message(struct usb_line6_pod *pod) 
		break;



	default:

		DEBUG_MESSAGES(dev_err

			       (pod->line6.ifcdev,

				"POD: unknown message %02X\n", buf[0]));

		dev_dbg(pod->line6.ifcdev, "POD: unknown message %02X\n",

			buf[0]);

	}

}

drivers/staging/line6/variax.c

+5 −7
Original line number Diff line number Diff line
@@ -262,10 +262,9 @@ void line6_variax_process_message(struct usb_line6_variax *variax) 
					     2, VARIAX_DUMP_PASS3);

				}

			} else {

				DEBUG_MESSAGES(dev_err

					       (variax->line6.ifcdev,

				dev_dbg(variax->line6.ifcdev,

					"illegal length %d of model data\n",

						variax->line6.message_length));

					variax->line6.message_length);

				line6_dump_finished(&variax->dumpreq);

			}

		} else if (memcmp(buf + 1, variax_request_bank + 1,
@@ -295,9 +294,8 @@ void line6_variax_process_message(struct usb_line6_variax *variax) 
		break;



	default:

		DEBUG_MESSAGES(dev_err

			       (variax->line6.ifcdev,

				"Variax: unknown message %02X\n", buf[0]));

		dev_dbg(variax->line6.ifcdev,

			"Variax: unknown message %02X\n", buf[0]);

	}

}