1 files changed, 25 insertions, 28 deletions

diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c
index e0a73271cb9..fe5dd982bd2 100644
--- a/sound/isa/wavefront/wavefront.c
+++ b/sound/isa/wavefront/wavefront.c
@@ -98,7 +98,7 @@ static struct pnp_card_device_id snd_wavefront_pnpids[] = {
 
 MODULE_DEVICE_TABLE(pnp_card, snd_wavefront_pnpids);
 
-static int __devinit
+static int
 snd_wavefront_pnp (int dev, snd_wavefront_card_t *acard, struct pnp_card_link *card,
                    const struct pnp_card_device_id *id)
 {
@@ -231,10 +231,9 @@ static irqreturn_t snd_wavefront_ics2115_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static struct snd_hwdep * __devinit
-snd_wavefront_new_synth (struct snd_card *card,
-                         int hw_dev,
-                         snd_wavefront_card_t *acard)
+static struct snd_hwdep *snd_wavefront_new_synth(struct snd_card *card,
+                                                 int hw_dev,
+                                                 snd_wavefront_card_t *acard)
 {
         struct snd_hwdep *wavefront_synth;
 
@@ -257,11 +256,10 @@ snd_wavefront_new_synth (struct snd_card *card,
         return wavefront_synth;
 }
 
-static struct snd_hwdep * __devinit
-snd_wavefront_new_fx (struct snd_card *card,
-                      int hw_dev,
-                      snd_wavefront_card_t *acard,
-                      unsigned long port)
+static struct snd_hwdep *snd_wavefront_new_fx(struct snd_card *card,
+                                              int hw_dev,
+                                              snd_wavefront_card_t *acard,
+                                              unsigned long port)
 
 {
         struct snd_hwdep *fx_processor;
@@ -284,12 +282,11 @@ snd_wavefront_new_fx (struct snd_card *card,
 static snd_wavefront_mpu_id internal_id = internal_mpu;
 static snd_wavefront_mpu_id external_id = external_mpu;
 
-static struct snd_rawmidi *__devinit
-snd_wavefront_new_midi (struct snd_card *card,
-                        int midi_dev,
-                        snd_wavefront_card_t *acard,
-                        unsigned long port,
-                        snd_wavefront_mpu_id mpu)
+static struct snd_rawmidi *snd_wavefront_new_midi(struct snd_card *card,
+                                                  int midi_dev,
+                                                  snd_wavefront_card_t *acard,
+                                                  unsigned long port,
+                                                  snd_wavefront_mpu_id mpu)
 
 {
         struct snd_rawmidi *rmidi;
@@ -361,7 +358,7 @@ static int snd_wavefront_card_new(int dev, struct snd_card **cardp)
         return 0;
 }
 
-static int __devinit
+static int
 snd_wavefront_probe (struct snd_card *card, int dev)
 {
         snd_wavefront_card_t *acard = card->private_data;
@@ -541,8 +538,8 @@ snd_wavefront_probe (struct snd_card *card, int dev)
         return snd_card_register(card);
 }       
 
-static int __devinit snd_wavefront_isa_match(struct device *pdev,
-                                             unsigned int dev)
+static int snd_wavefront_isa_match(struct device *pdev,
+                                   unsigned int dev)
 {
         if (!enable[dev])
                 return 0;
@@ -561,8 +558,8 @@ static int __devinit snd_wavefront_isa_match(struct device *pdev,
         return 1;
 }
 
-static int __devinit snd_wavefront_isa_probe(struct device *pdev,
-                                             unsigned int dev)
+static int snd_wavefront_isa_probe(struct device *pdev,
+                                   unsigned int dev)
 {
         struct snd_card *card;
         int err;
@@ -580,8 +577,8 @@ static int __devinit snd_wavefront_isa_probe(struct device *pdev,
         return 0;
 }
 
-static int __devexit snd_wavefront_isa_remove(struct device *devptr,
-                                              unsigned int dev)
+static int snd_wavefront_isa_remove(struct device *devptr,
+                                    unsigned int dev)
 {
         snd_card_free(dev_get_drvdata(devptr));
         dev_set_drvdata(devptr, NULL);
@@ -593,7 +590,7 @@ static int __devexit snd_wavefront_isa_remove(struct device *devptr,
 static struct isa_driver snd_wavefront_driver = {
         .match          = snd_wavefront_isa_match,
         .probe          = snd_wavefront_isa_probe,
-        .remove         = __devexit_p(snd_wavefront_isa_remove),
+        .remove         = snd_wavefront_isa_remove,
         /* FIXME: suspend, resume */
         .driver         = {
                 .name   = DEV_NAME
@@ -602,8 +599,8 @@ static struct isa_driver snd_wavefront_driver = {
 
 
 #ifdef CONFIG_PNP
-static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard,
-                                        const struct pnp_card_device_id *pid)
+static int snd_wavefront_pnp_detect(struct pnp_card_link *pcard,
+                                    const struct pnp_card_device_id *pid)
 {
         static int dev;
         struct snd_card *card;
@@ -637,7 +634,7 @@ static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard,
         return 0;
 }
 
-static void __devexit snd_wavefront_pnp_remove(struct pnp_card_link * pcard)
+static void snd_wavefront_pnp_remove(struct pnp_card_link *pcard)
 {
         snd_card_free(pnp_get_card_drvdata(pcard));
         pnp_set_card_drvdata(pcard, NULL);
@@ -648,7 +645,7 @@ static struct pnp_card_driver wavefront_pnpc_driver = {
         .name           = "wavefront",
         .id_table       = snd_wavefront_pnpids,
         .probe          = snd_wavefront_pnp_detect,
-        .remove         = __devexit_p(snd_wavefront_pnp_remove),
+        .remove         = snd_wavefront_pnp_remove,
         /* FIXME: suspend,resume */
 };