ALSA: oxygen: remove __dev* attributes

CONFIG_HOTPLUG is going away as an option.  As result the __dev*
markings will be going away.

Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index 2becae155a48d2f0c49bcb999194bc61a469e139..ada6c256378e18660061c59c37352785314b41f8 100644 (file)
--- 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 8104eab90e511a20524995e07a5d8badfad09eb4..64b9fda5f04a71f4d0898d083468a6ed94437d8f 100644 (file)
--- 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 c8febf4b9bd6e10c9763c989ee1d059486f019bc..d231b93d6ab5443604aa651ff859e266f7d6a60c 100644 (file)
--- 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 8433aa7c3d754064f9e0b57cae437277161f09f5..c8c7f2c9b355ae8f4dde5d8deb4b68a11a64f296 100644 (file)
--- 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 b555b620babb770c4a2030e38562c59795fbdf58..6ce68604c25e4834460b3c0533e8b1eaca511151 100644 (file)
--- 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: