Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 256813
b: refs/heads/master
c: f4c7981
h: refs/heads/master
i:
  256811: 1f9487f
v: v3
  • Loading branch information
Axel Lin authored and Jiri Kosina committed Jul 21, 2011
1 parent 551938b commit f3dbff0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 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: 2dcd9543a28da523a179a13b1eefa5f9b8e05d72
refs/heads/master: f4c79818ac6e36e304a01ea2fb6be6e14a545bcf
15 changes: 8 additions & 7 deletions trunk/drivers/hid/hid-prodikeys.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,15 +242,15 @@ static void pcmidi_send_note(struct pcmidi_snd *pm,
return;
}

void pcmidi_sustained_note_release(unsigned long data)
static void pcmidi_sustained_note_release(unsigned long data)
{
struct pcmidi_sustain *pms = (struct pcmidi_sustain *)data;

pcmidi_send_note(pms->pm, pms->status, pms->note, pms->velocity);
pms->in_use = 0;
}

void init_sustain_timers(struct pcmidi_snd *pm)
static void init_sustain_timers(struct pcmidi_snd *pm)
{
struct pcmidi_sustain *pms;
unsigned i;
Expand All @@ -264,7 +264,7 @@ void init_sustain_timers(struct pcmidi_snd *pm)
}
}

void stop_sustain_timers(struct pcmidi_snd *pm)
static void stop_sustain_timers(struct pcmidi_snd *pm)
{
struct pcmidi_sustain *pms;
unsigned i;
Expand Down Expand Up @@ -499,7 +499,7 @@ static int pcmidi_handle_report4(struct pcmidi_snd *pm, u8 *data)
return 1;
}

int pcmidi_handle_report(
static int pcmidi_handle_report(
struct pcmidi_snd *pm, unsigned report_id, u8 *data, int size)
{
int ret = 0;
Expand All @@ -518,7 +518,8 @@ int pcmidi_handle_report(
return ret;
}

void pcmidi_setup_extra_keys(struct pcmidi_snd *pm, struct input_dev *input)
static void pcmidi_setup_extra_keys(
struct pcmidi_snd *pm, struct input_dev *input)
{
/* reassigned functionality for N/A keys
MY PICTURES => KEY_WORDPROCESSOR
Expand Down Expand Up @@ -602,7 +603,7 @@ static struct snd_rawmidi_ops pcmidi_in_ops = {
.trigger = pcmidi_in_trigger
};

int pcmidi_snd_initialise(struct pcmidi_snd *pm)
static int pcmidi_snd_initialise(struct pcmidi_snd *pm)
{
static int dev;
struct snd_card *card;
Expand Down Expand Up @@ -720,7 +721,7 @@ int pcmidi_snd_initialise(struct pcmidi_snd *pm)
return err;
}

int pcmidi_snd_terminate(struct pcmidi_snd *pm)
static int pcmidi_snd_terminate(struct pcmidi_snd *pm)
{
if (pm->card) {
stop_sustain_timers(pm);
Expand Down

0 comments on commit f3dbff0

Please sign in to comment.