|
@@ -856,7 +856,7 @@ static struct snd_kcontrol_new snd_harmony_controls[] = {
|
|
|
HARMONY_GAIN_HE_SHIFT, 1, 0),
|
|
|
};
|
|
|
|
|
|
-static void __devinit
|
|
|
+static void
|
|
|
snd_harmony_mixer_reset(struct snd_harmony *h)
|
|
|
{
|
|
|
harmony_mute(h);
|
|
@@ -865,7 +865,7 @@ snd_harmony_mixer_reset(struct snd_harmony *h)
|
|
|
harmony_unmute(h);
|
|
|
}
|
|
|
|
|
|
-static int __devinit
|
|
|
+static int
|
|
|
snd_harmony_mixer_init(struct snd_harmony *h)
|
|
|
{
|
|
|
struct snd_card *card;
|
|
@@ -915,7 +915,7 @@ snd_harmony_dev_free(struct snd_device *dev)
|
|
|
return snd_harmony_free(h);
|
|
|
}
|
|
|
|
|
|
-static int __devinit
|
|
|
+static int
|
|
|
snd_harmony_create(struct snd_card *card,
|
|
|
struct parisc_device *padev,
|
|
|
struct snd_harmony **rchip)
|
|
@@ -972,7 +972,7 @@ free_and_ret:
|
|
|
return err;
|
|
|
}
|
|
|
|
|
|
-static int __devinit
|
|
|
+static int
|
|
|
snd_harmony_probe(struct parisc_device *padev)
|
|
|
{
|
|
|
int err;
|
|
@@ -1012,7 +1012,7 @@ free_and_ret:
|
|
|
return err;
|
|
|
}
|
|
|
|
|
|
-static int __devexit
|
|
|
+static int
|
|
|
snd_harmony_remove(struct parisc_device *padev)
|
|
|
{
|
|
|
snd_card_free(parisc_get_drvdata(padev));
|
|
@@ -1024,7 +1024,7 @@ static struct parisc_driver snd_harmony_driver = {
|
|
|
.name = "harmony",
|
|
|
.id_table = snd_harmony_devtable,
|
|
|
.probe = snd_harmony_probe,
|
|
|
- .remove = __devexit_p(snd_harmony_remove),
|
|
|
+ .remove = snd_harmony_remove,
|
|
|
};
|
|
|
|
|
|
static int __init
|