5 files changed, 16 insertions, 16 deletions

diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index 2becae155a48..ada6c256378e 100644
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -756,8 +756,8 @@ static const struct oxygen_model model_generic = {
         .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };
 
-static int __devinit get_oxygen_model(struct oxygen *chip,
-                                      const struct pci_device_id *id)
+static int get_oxygen_model(struct oxygen *chip,
+                            const struct pci_device_id *id)
 {
         static const char *const names[] = {
                 [MODEL_MERIDIAN]        = "AuzenTech X-Meridian",
@@ -848,8 +848,8 @@ static int __devinit get_oxygen_model(struct oxygen *chip,
         return 0;
 }
 
-static int __devinit generic_oxygen_probe(struct pci_dev *pci,
-                                          const struct pci_device_id *pci_id)
+static int generic_oxygen_probe(struct pci_dev *pci,
+                                const struct pci_device_id *pci_id)
 {
         static int dev;
         int err;
@@ -871,7 +871,7 @@ static struct pci_driver oxygen_driver = {
         .name = KBUILD_MODNAME,
         .id_table = oxygen_ids,
         .probe = generic_oxygen_probe,
-        .remove = __devexit_p(oxygen_pci_remove),
+        .remove = oxygen_pci_remove,
 #ifdef CONFIG_PM_SLEEP
         .driver = {
                 .pm = &oxygen_pci_pm,
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
index 8104eab90e51..64b9fda5f04a 100644
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -58,8 +58,8 @@ static DEFINE_PCI_DEVICE_TABLE(xonar_ids) = {
 };
 MODULE_DEVICE_TABLE(pci, xonar_ids);
 
-static int __devinit get_xonar_model(struct oxygen *chip,
-                                     const struct pci_device_id *id)
+static int get_xonar_model(struct oxygen *chip,
+                           const struct pci_device_id *id)
 {
         if (get_xonar_pcm179x_model(chip, id) >= 0)
                 return 0;
@@ -70,8 +70,8 @@ static int __devinit get_xonar_model(struct oxygen *chip,
         return -EINVAL;
 }
 
-static int __devinit xonar_probe(struct pci_dev *pci,
-                                 const struct pci_device_id *pci_id)
+static int xonar_probe(struct pci_dev *pci,
+                       const struct pci_device_id *pci_id)
 {
         static int dev;
         int err;
@@ -93,7 +93,7 @@ static struct pci_driver xonar_driver = {
         .name = KBUILD_MODNAME,
         .id_table = xonar_ids,
         .probe = xonar_probe,
-        .remove = __devexit_p(oxygen_pci_remove),
+        .remove = oxygen_pci_remove,
 #ifdef CONFIG_PM_SLEEP
         .driver = {
                 .pm = &oxygen_pci_pm,
diff --git a/sound/pci/oxygen/xonar_cs43xx.c b/sound/pci/oxygen/xonar_cs43xx.c
index c8febf4b9bd6..d231b93d6ab5 100644
--- a/sound/pci/oxygen/xonar_cs43xx.c
+++ b/sound/pci/oxygen/xonar_cs43xx.c
@@ -431,8 +431,8 @@ static const struct oxygen_model model_xonar_d1 = {
         .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };
 
-int __devinit get_xonar_cs43xx_model(struct oxygen *chip,
-                                     const struct pci_device_id *id)
+int get_xonar_cs43xx_model(struct oxygen *chip,
+                           const struct pci_device_id *id)
 {
         switch (id->subdevice) {
         case 0x834f:
diff --git a/sound/pci/oxygen/xonar_pcm179x.c b/sound/pci/oxygen/xonar_pcm179x.c
index 8433aa7c3d75..c8c7f2c9b355 100644
--- a/sound/pci/oxygen/xonar_pcm179x.c
+++ b/sound/pci/oxygen/xonar_pcm179x.c
@@ -1087,8 +1087,8 @@ static const struct oxygen_model model_xonar_st = {
         .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };
 
-int __devinit get_xonar_pcm179x_model(struct oxygen *chip,
-                                      const struct pci_device_id *id)
+int get_xonar_pcm179x_model(struct oxygen *chip,
+                            const struct pci_device_id *id)
 {
         switch (id->subdevice) {
         case 0x8269:
diff --git a/sound/pci/oxygen/xonar_wm87x6.c b/sound/pci/oxygen/xonar_wm87x6.c
index b555b620babb..6ce68604c25e 100644
--- a/sound/pci/oxygen/xonar_wm87x6.c
+++ b/sound/pci/oxygen/xonar_wm87x6.c
@@ -1320,8 +1320,8 @@ static const struct oxygen_model model_xonar_hdav_slim = {
         .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };
 
-int __devinit get_xonar_wm87x6_model(struct oxygen *chip,
-                                     const struct pci_device_id *id)
+int get_xonar_wm87x6_model(struct oxygen *chip,
+                           const struct pci_device_id *id)
 {
         switch (id->subdevice) {
         case 0x838e: