Merge branch 'topic/udev-id-rename' into to-push

diff --combined sound/pci/rme9652/hdsp.c
index f87ff0497116ee02d8770e987dd6a32c5f272537,fdd3be5b439d646d3ced8c63c87aceef07c13a64..44d0c15e2b71a150cf2643194a978e6c6fa7ee95
--- 1/sound/pci/rme9652/hdsp.c
--- 2/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@@ -1452,7 -1452,7 +1452,7 @@@ static int snd_hdsp_create_midi (struc
        if (snd_rawmidi_new (card, buf, id, 1, 1, &hdsp->midi[id].rmidi) < 0)
                return -1;
  
-       sprintf (hdsp->midi[id].rmidi->name, "%s MIDI %d", card->id, id+1);
+       sprintf(hdsp->midi[id].rmidi->name, "HDSP MIDI %d", id+1);
        hdsp->midi[id].rmidi->private_data = &hdsp->midi[id];
  
        snd_rawmidi_set_ops (hdsp->midi[id].rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &snd_hdsp_midi_output);
@@@ -3750,7 -3750,7 +3750,7 @@@ static irqreturn_t snd_hdsp_interrupt(i
                }
        }
        if (hdsp->use_midi_tasklet && schedule)
 -              tasklet_hi_schedule(&hdsp->midi_tasklet);
 +              tasklet_schedule(&hdsp->midi_tasklet);
        return IRQ_HANDLED;
  }
  

diff --combined sound/pci/rme9652/hdspm.c
index d7dd53675ccd599d8ff77585a0e64813fcfd9b51,dc5c4baa1e64a6819424350e1adc45e5803108c6..71231cf1b2b0ac2c335236d40ba4a5f99543d47b
--- 1/sound/pci/rme9652/hdspm.c
--- 2/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@@ -1293,7 -1293,7 +1293,7 @@@ static int __devinit snd_hdspm_create_m
        if (err < 0)
                return err;
  
-       sprintf (hdspm->midi[id].rmidi->name, "%s MIDI %d", card->id, id+1);
+       sprintf(hdspm->midi[id].rmidi->name, "HDSPM MIDI %d", id+1);
        hdspm->midi[id].rmidi->private_data = &hdspm->midi[id];
  
        snd_rawmidi_set_ops(hdspm->midi[id].rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,
@@@ -3476,7 -3476,7 +3476,7 @@@ static irqreturn_t snd_hdspm_interrupt(
                schedule = 1;
        }
        if (schedule)
 -              tasklet_hi_schedule(&hdspm->midi_tasklet);
 +              tasklet_schedule(&hdspm->midi_tasklet);
        return IRQ_HANDLED;
  }