Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338205
b: refs/heads/master
c: 9c29cf5
h: refs/heads/master
i:
  338203: c4fe3b1
v: v3
  • Loading branch information
Stefan Hajnoczi authored and Greg Kroah-Hartman committed Nov 27, 2012
1 parent 9f3cab0 commit d564639
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 22 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: cab3c900c191a21dad70fcc35d0156dc42d509c8
refs/heads/master: 9c29cf51d16f36c6b20b49091a1263a28aba7794
16 changes: 0 additions & 16 deletions trunk/drivers/staging/line6/pod.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,17 +130,6 @@ static void pod_startup2(unsigned long data);
static void pod_startup3(struct usb_line6_pod *pod);
static void pod_startup4(struct usb_line6_pod *pod);

/*
Mark all parameters as dirty and notify waiting processes.
*/
static void pod_mark_batch_all_dirty(struct usb_line6_pod *pod)
{
int i;

for (i = 0; i < POD_CONTROL_SIZE; i++)
set_bit(i, pod->param_dirty);
}

static char *pod_alloc_sysex_buffer(struct usb_line6_pod *pod, int code,
int size)
{
Expand All @@ -163,7 +152,6 @@ static void pod_dump(struct usb_line6_pod *pod, const unsigned char *data)
memcpy(sysex + SYSEX_DATA_OFS + 1, data, sizeof(pod->prog_data));
line6_send_sysex_message(&pod->line6, sysex, size);
memcpy(&pod->prog_data, data, sizeof(pod->prog_data));
pod_mark_batch_all_dirty(pod);
kfree(sysex);
}

Expand All @@ -173,7 +161,6 @@ static void pod_dump(struct usb_line6_pod *pod, const unsigned char *data)
static void pod_store_parameter(struct usb_line6_pod *pod, int param, int value)
{
pod->prog_data.control[param] = value;
set_bit(param, pod->param_dirty);
pod->dirty = 1;
}

Expand Down Expand Up @@ -239,7 +226,6 @@ void line6_pod_process_message(struct usb_line6_pod *pod)
case LINE6_DUMP_CURRENT:
memcpy(&pod->prog_data, buf + 7,
sizeof(pod->prog_data));
pod_mark_batch_all_dirty(pod);
break;

case POD_DUMP_MEMORY:
Expand Down Expand Up @@ -1139,8 +1125,6 @@ static int pod_try_init(struct usb_interface *interface,
init_waitqueue_head(&pod->tuner_note.wait);
init_waitqueue_head(&pod->tuner_pitch.wait);

memset(pod->param_dirty, 0xff, sizeof(pod->param_dirty));

/* initialize USB buffers: */
err = line6_dumpreq_init(&pod->dumpreq, pod_request_channel,
sizeof(pod_request_channel));
Expand Down
5 changes: 0 additions & 5 deletions trunk/drivers/staging/line6/pod.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,6 @@ struct usb_line6_pod {
*/
int startup_progress;

/**
Dirty flags for access to parameter data.
*/
unsigned long param_dirty[POD_CONTROL_SIZE / sizeof(unsigned long)];

/**
Some atomic flags.
*/
Expand Down

0 comments on commit d564639

Please sign in to comment.