tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Bill Pemberton and committed by
Takashi Iwai f120a6fb 3dd06763

+16 -16
+5 -5
sound/pci/oxygen/oxygen.c
··· 756 756 .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, 757 757 }; 758 758 759 - static int __devinit get_oxygen_model(struct oxygen *chip, 760 - const struct pci_device_id *id) 759 + static int get_oxygen_model(struct oxygen *chip, 760 + const struct pci_device_id *id) 761 761 { 762 762 static const char *const names[] = { 763 763 [MODEL_MERIDIAN] = "AuzenTech X-Meridian", ··· 848 848 return 0; 849 849 } 850 850 851 - static int __devinit generic_oxygen_probe(struct pci_dev *pci, 852 - const struct pci_device_id *pci_id) 851 + static int generic_oxygen_probe(struct pci_dev *pci, 852 + const struct pci_device_id *pci_id) 853 853 { 854 854 static int dev; 855 855 int err; ··· 871 871 .name = KBUILD_MODNAME, 872 872 .id_table = oxygen_ids, 873 873 .probe = generic_oxygen_probe, 874 - .remove = __devexit_p(oxygen_pci_remove), 874 + .remove = oxygen_pci_remove, 875 875 #ifdef CONFIG_PM_SLEEP 876 876 .driver = { 877 877 .pm = &oxygen_pci_pm,
+5 -5
sound/pci/oxygen/virtuoso.c
··· 58 58 }; 59 59 MODULE_DEVICE_TABLE(pci, xonar_ids); 60 60 61 - static int __devinit get_xonar_model(struct oxygen *chip, 62 - const struct pci_device_id *id) 61 + static int get_xonar_model(struct oxygen *chip, 62 + const struct pci_device_id *id) 63 63 { 64 64 if (get_xonar_pcm179x_model(chip, id) >= 0) 65 65 return 0; ··· 70 70 return -EINVAL; 71 71 } 72 72 73 - static int __devinit xonar_probe(struct pci_dev *pci, 74 - const struct pci_device_id *pci_id) 73 + static int xonar_probe(struct pci_dev *pci, 74 + const struct pci_device_id *pci_id) 75 75 { 76 76 static int dev; 77 77 int err; ··· 93 93 .name = KBUILD_MODNAME, 94 94 .id_table = xonar_ids, 95 95 .probe = xonar_probe, 96 - .remove = __devexit_p(oxygen_pci_remove), 96 + .remove = oxygen_pci_remove, 97 97 #ifdef CONFIG_PM_SLEEP 98 98 .driver = { 99 99 .pm = &oxygen_pci_pm,
+2 -2
sound/pci/oxygen/xonar_cs43xx.c
··· 431 431 .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, 432 432 }; 433 433 434 - int __devinit get_xonar_cs43xx_model(struct oxygen *chip, 435 - const struct pci_device_id *id) 434 + int get_xonar_cs43xx_model(struct oxygen *chip, 435 + const struct pci_device_id *id) 436 436 { 437 437 switch (id->subdevice) { 438 438 case 0x834f:
+2 -2
sound/pci/oxygen/xonar_pcm179x.c
··· 1087 1087 .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, 1088 1088 }; 1089 1089 1090 - int __devinit get_xonar_pcm179x_model(struct oxygen *chip, 1091 - const struct pci_device_id *id) 1090 + int get_xonar_pcm179x_model(struct oxygen *chip, 1091 + const struct pci_device_id *id) 1092 1092 { 1093 1093 switch (id->subdevice) { 1094 1094 case 0x8269:
+2 -2
sound/pci/oxygen/xonar_wm87x6.c
··· 1320 1320 .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, 1321 1321 }; 1322 1322 1323 - int __devinit get_xonar_wm87x6_model(struct oxygen *chip, 1324 - const struct pci_device_id *id) 1323 + int get_xonar_wm87x6_model(struct oxygen *chip, 1324 + const struct pci_device_id *id) 1325 1325 { 1326 1326 switch (id->subdevice) { 1327 1327 case 0x838e: