aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-06 12:35:20 -0500
committerTakashi Iwai <tiwai@suse.de>2012-12-07 01:32:02 -0500
commitf120a6fb486c2500c9ae11fd2da11fbde29bc186 (patch)
treef5305274e640bc47eaed0a8ce0091c402be81953 /sound
parent3dd0676335f846e3e7d275c379a112c2f8a832cb (diff)
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/oxygen/oxygen.c10
-rw-r--r--sound/pci/oxygen/virtuoso.c10
-rw-r--r--sound/pci/oxygen/xonar_cs43xx.c4
-rw-r--r--sound/pci/oxygen/xonar_pcm179x.c4
-rw-r--r--sound/pci/oxygen/xonar_wm87x6.c4
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 = {
756 .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, 756 .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
757}; 757};
758 758
759static int __devinit get_oxygen_model(struct oxygen *chip, 759static int get_oxygen_model(struct oxygen *chip,
760 const struct pci_device_id *id) 760 const struct pci_device_id *id)
761{ 761{
762 static const char *const names[] = { 762 static const char *const names[] = {
763 [MODEL_MERIDIAN] = "AuzenTech X-Meridian", 763 [MODEL_MERIDIAN] = "AuzenTech X-Meridian",
@@ -848,8 +848,8 @@ static int __devinit get_oxygen_model(struct oxygen *chip,
848 return 0; 848 return 0;
849} 849}
850 850
851static int __devinit generic_oxygen_probe(struct pci_dev *pci, 851static int generic_oxygen_probe(struct pci_dev *pci,
852 const struct pci_device_id *pci_id) 852 const struct pci_device_id *pci_id)
853{ 853{
854 static int dev; 854 static int dev;
855 int err; 855 int err;
@@ -871,7 +871,7 @@ static struct pci_driver oxygen_driver = {
871 .name = KBUILD_MODNAME, 871 .name = KBUILD_MODNAME,
872 .id_table = oxygen_ids, 872 .id_table = oxygen_ids,
873 .probe = generic_oxygen_probe, 873 .probe = generic_oxygen_probe,
874 .remove = __devexit_p(oxygen_pci_remove), 874 .remove = oxygen_pci_remove,
875#ifdef CONFIG_PM_SLEEP 875#ifdef CONFIG_PM_SLEEP
876 .driver = { 876 .driver = {
877 .pm = &oxygen_pci_pm, 877 .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) = {
58}; 58};
59MODULE_DEVICE_TABLE(pci, xonar_ids); 59MODULE_DEVICE_TABLE(pci, xonar_ids);
60 60
61static int __devinit get_xonar_model(struct oxygen *chip, 61static int get_xonar_model(struct oxygen *chip,
62 const struct pci_device_id *id) 62 const struct pci_device_id *id)
63{ 63{
64 if (get_xonar_pcm179x_model(chip, id) >= 0) 64 if (get_xonar_pcm179x_model(chip, id) >= 0)
65 return 0; 65 return 0;
@@ -70,8 +70,8 @@ static int __devinit get_xonar_model(struct oxygen *chip,
70 return -EINVAL; 70 return -EINVAL;
71} 71}
72 72
73static int __devinit xonar_probe(struct pci_dev *pci, 73static int xonar_probe(struct pci_dev *pci,
74 const struct pci_device_id *pci_id) 74 const struct pci_device_id *pci_id)
75{ 75{
76 static int dev; 76 static int dev;
77 int err; 77 int err;
@@ -93,7 +93,7 @@ static struct pci_driver xonar_driver = {
93 .name = KBUILD_MODNAME, 93 .name = KBUILD_MODNAME,
94 .id_table = xonar_ids, 94 .id_table = xonar_ids,
95 .probe = xonar_probe, 95 .probe = xonar_probe,
96 .remove = __devexit_p(oxygen_pci_remove), 96 .remove = oxygen_pci_remove,
97#ifdef CONFIG_PM_SLEEP 97#ifdef CONFIG_PM_SLEEP
98 .driver = { 98 .driver = {
99 .pm = &oxygen_pci_pm, 99 .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 = {
431 .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, 431 .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
432}; 432};
433 433
434int __devinit get_xonar_cs43xx_model(struct oxygen *chip, 434int get_xonar_cs43xx_model(struct oxygen *chip,
435 const struct pci_device_id *id) 435 const struct pci_device_id *id)
436{ 436{
437 switch (id->subdevice) { 437 switch (id->subdevice) {
438 case 0x834f: 438 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 = {
1087 .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, 1087 .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
1088}; 1088};
1089 1089
1090int __devinit get_xonar_pcm179x_model(struct oxygen *chip, 1090int get_xonar_pcm179x_model(struct oxygen *chip,
1091 const struct pci_device_id *id) 1091 const struct pci_device_id *id)
1092{ 1092{
1093 switch (id->subdevice) { 1093 switch (id->subdevice) {
1094 case 0x8269: 1094 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 = {
1320 .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, 1320 .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
1321}; 1321};
1322 1322
1323int __devinit get_xonar_wm87x6_model(struct oxygen *chip, 1323int get_xonar_wm87x6_model(struct oxygen *chip,
1324 const struct pci_device_id *id) 1324 const struct pci_device_id *id)
1325{ 1325{
1326 switch (id->subdevice) { 1326 switch (id->subdevice) {
1327 case 0x838e: 1327 case 0x838e: