1 files changed, 9 insertions, 9 deletions

diff --git a/sound/isa/sb/jazz16.c b/sound/isa/sb/jazz16.c
index 410758c68090..4961da4e627c 100644
--- a/sound/isa/sb/jazz16.c
+++ b/sound/isa/sb/jazz16.c
@@ -78,8 +78,8 @@ static irqreturn_t jazz16_interrupt(int irq, void *chip)
         return snd_sb8dsp_interrupt(chip);
 }
 
-static int __devinit jazz16_configure_ports(unsigned long port,
-                                            unsigned long mpu_port, int idx)
+static int jazz16_configure_ports(unsigned long port,
+                                  unsigned long mpu_port, int idx)
 {
         unsigned char val;
 
@@ -99,8 +99,8 @@ static int __devinit jazz16_configure_ports(unsigned long port,
         return 0;
 }
 
-static int __devinit jazz16_detect_board(unsigned long port,
-                                         unsigned long mpu_port)
+static int jazz16_detect_board(unsigned long port,
+                               unsigned long mpu_port)
 {
         int err;
         int val;
@@ -156,7 +156,7 @@ err_unmap:
         return err;
 }
 
-static int __devinit jazz16_configure_board(struct snd_sb *chip, int mpu_irq)
+static int jazz16_configure_board(struct snd_sb *chip, int mpu_irq)
 {
         static unsigned char jazz_irq_bits[] = { 0, 0, 2, 3, 0, 1, 0, 4,
                                                  0, 2, 5, 0, 0, 0, 0, 6 };
@@ -183,7 +183,7 @@ static int __devinit jazz16_configure_board(struct snd_sb *chip, int mpu_irq)
         return 0;
 }
 
-static int __devinit snd_jazz16_match(struct device *devptr, unsigned int dev)
+static int snd_jazz16_match(struct device *devptr, unsigned int dev)
 {
         if (!enable[dev])
                 return 0;
@@ -218,7 +218,7 @@ static int __devinit snd_jazz16_match(struct device *devptr, unsigned int dev)
         return 1;
 }
 
-static int __devinit snd_jazz16_probe(struct device *devptr, unsigned int dev)
+static int snd_jazz16_probe(struct device *devptr, unsigned int dev)
 {
         struct snd_card *card;
         struct snd_card_jazz16 *jazz16;
@@ -341,7 +341,7 @@ err_free:
         return err;
 }
 
-static int __devexit snd_jazz16_remove(struct device *devptr, unsigned int dev)
+static int snd_jazz16_remove(struct device *devptr, unsigned int dev)
 {
         struct snd_card *card = dev_get_drvdata(devptr);
 
@@ -380,7 +380,7 @@ static int snd_jazz16_resume(struct device *pdev, unsigned int n)
 static struct isa_driver snd_jazz16_driver = {
         .match          = snd_jazz16_match,
         .probe          = snd_jazz16_probe,
-        .remove         = __devexit_p(snd_jazz16_remove),
+        .remove         = snd_jazz16_remove,
 #ifdef CONFIG_PM
         .suspend        = snd_jazz16_suspend,
         .resume         = snd_jazz16_resume,