Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337832
b: refs/heads/master
c: e00d33c
h: refs/heads/master
v: v3
  • Loading branch information
Stefan Hajnoczi authored and Greg Kroah-Hartman committed Nov 13, 2012
1 parent 5d377e5 commit 7b4be22
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 48 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: e5603cbd7f6b8d8ec6a59d3ce11c3fa28ef2a733
refs/heads/master: e00d33cb5de0c68ed95513d3b4f42f9e3697f8ee
6 changes: 2 additions & 4 deletions trunk/drivers/staging/line6/driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 (;;) {
Expand Down
57 changes: 21 additions & 36 deletions trunk/drivers/staging/line6/pod.c
Original file line number Diff line number Diff line change
Expand Up @@ -252,25 +252,19 @@ void line6_pod_process_message(struct usb_line6_pod *pod)
break;

default:
DEBUG_MESSAGES(dev_err
(pod->
line6.ifcdev,
"unknown dump code %02X\n",
pod->
dumpreq.in_progress));
dev_dbg(pod->line6.ifcdev,
"unknown dump code %02X\n",
pod->dumpreq.in_progress);
}

line6_dump_finished(&pod->dumpreq);
pod_startup3(pod);
} else
DEBUG_MESSAGES(dev_err
(pod->line6.ifcdev,
"wrong size of channel dump message (%d instead of %d)\n",
pod->
line6.message_length,
(int)
sizeof(pod->prog_data) +
7));
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);

break;

Expand Down Expand Up @@ -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,
"unknown tuner/system response %02X\n",
buf[6]));
dev_dbg(pod->line6.ifcdev,
"unknown tuner/system response %02X\n",
buf[6]);
}

break;
Expand All @@ -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,
"message %02X not yet implemented\n",
buf[5]));
dev_dbg(pod->line6.ifcdev,
"message %02X not yet implemented\n",
buf[5]);
break;

default:
DEBUG_MESSAGES(dev_err
(pod->line6.ifcdev,
"unknown sysex message %02X\n",
buf[5]));
dev_dbg(pod->line6.ifcdev,
"unknown sysex message %02X\n",
buf[5]);
}
} else
if (memcmp
Expand All @@ -352,19 +340,16 @@ 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;

case LINE6_SYSEX_END:
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]);
}
}

Expand Down
12 changes: 5 additions & 7 deletions trunk/drivers/staging/line6/variax.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
"illegal length %d of model data\n",
variax->line6.message_length));
dev_dbg(variax->line6.ifcdev,
"illegal length %d of model data\n",
variax->line6.message_length);
line6_dump_finished(&variax->dumpreq);
}
} else if (memcmp(buf + 1, variax_request_bank + 1,
Expand Down Expand Up @@ -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]);
}
}

Expand Down

0 comments on commit 7b4be22

Please sign in to comment.