aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/via82xx.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-06 12:35:10 -0500
committerTakashi Iwai <tiwai@suse.de>2012-12-07 01:20:55 -0500
commite23e7a1436207217000c2854214bc908936af3cb (patch)
treeaebb83a4e59dde76a79ac60b51b67849c75c545b /sound/pci/via82xx.c
parent445a51b353c35fe54840c10352ef51152fbb94df (diff)
ALSA: pci: 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> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/via82xx.c')
-rw-r--r--sound/pci/via82xx.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index f0b4efdb483c..6442f611a07b 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -1437,7 +1437,7 @@ static void init_viadev(struct via82xx *chip, int idx, unsigned int reg_offset,
1437/* 1437/*
1438 * create pcm instances for VIA8233, 8233C and 8235 (not 8233A) 1438 * create pcm instances for VIA8233, 8233C and 8235 (not 8233A)
1439 */ 1439 */
1440static int __devinit snd_via8233_pcm_new(struct via82xx *chip) 1440static int snd_via8233_pcm_new(struct via82xx *chip)
1441{ 1441{
1442 struct snd_pcm *pcm; 1442 struct snd_pcm *pcm;
1443 struct snd_pcm_chmap *chmap; 1443 struct snd_pcm_chmap *chmap;
@@ -1505,7 +1505,7 @@ static int __devinit snd_via8233_pcm_new(struct via82xx *chip)
1505/* 1505/*
1506 * create pcm instances for VIA8233A 1506 * create pcm instances for VIA8233A
1507 */ 1507 */
1508static int __devinit snd_via8233a_pcm_new(struct via82xx *chip) 1508static int snd_via8233a_pcm_new(struct via82xx *chip)
1509{ 1509{
1510 struct snd_pcm *pcm; 1510 struct snd_pcm *pcm;
1511 struct snd_pcm_chmap *chmap; 1511 struct snd_pcm_chmap *chmap;
@@ -1566,7 +1566,7 @@ static int __devinit snd_via8233a_pcm_new(struct via82xx *chip)
1566/* 1566/*
1567 * create a pcm instance for via686a/b 1567 * create a pcm instance for via686a/b
1568 */ 1568 */
1569static int __devinit snd_via686_pcm_new(struct via82xx *chip) 1569static int snd_via686_pcm_new(struct via82xx *chip)
1570{ 1570{
1571 struct snd_pcm *pcm; 1571 struct snd_pcm *pcm;
1572 int err; 1572 int err;
@@ -1643,7 +1643,7 @@ static int snd_via8233_capture_source_put(struct snd_kcontrol *kcontrol,
1643 return val != oval; 1643 return val != oval;
1644} 1644}
1645 1645
1646static struct snd_kcontrol_new snd_via8233_capture_source __devinitdata = { 1646static struct snd_kcontrol_new snd_via8233_capture_source = {
1647 .name = "Input Source Select", 1647 .name = "Input Source Select",
1648 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1648 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
1649 .info = snd_via8233_capture_source_info, 1649 .info = snd_via8233_capture_source_info,
@@ -1683,7 +1683,7 @@ static int snd_via8233_dxs3_spdif_put(struct snd_kcontrol *kcontrol,
1683 return 0; 1683 return 0;
1684} 1684}
1685 1685
1686static struct snd_kcontrol_new snd_via8233_dxs3_spdif_control __devinitdata = { 1686static struct snd_kcontrol_new snd_via8233_dxs3_spdif_control = {
1687 .name = SNDRV_CTL_NAME_IEC958("Output ",NONE,SWITCH), 1687 .name = SNDRV_CTL_NAME_IEC958("Output ",NONE,SWITCH),
1688 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1688 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
1689 .info = snd_via8233_dxs3_spdif_info, 1689 .info = snd_via8233_dxs3_spdif_info,
@@ -1772,7 +1772,7 @@ static int snd_via8233_pcmdxs_volume_put(struct snd_kcontrol *kcontrol,
1772 1772
1773static const DECLARE_TLV_DB_SCALE(db_scale_dxs, -4650, 150, 1); 1773static const DECLARE_TLV_DB_SCALE(db_scale_dxs, -4650, 150, 1);
1774 1774
1775static struct snd_kcontrol_new snd_via8233_pcmdxs_volume_control __devinitdata = { 1775static struct snd_kcontrol_new snd_via8233_pcmdxs_volume_control = {
1776 .name = "PCM Playback Volume", 1776 .name = "PCM Playback Volume",
1777 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1777 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
1778 .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE | 1778 .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |
@@ -1783,7 +1783,7 @@ static struct snd_kcontrol_new snd_via8233_pcmdxs_volume_control __devinitdata =
1783 .tlv = { .p = db_scale_dxs } 1783 .tlv = { .p = db_scale_dxs }
1784}; 1784};
1785 1785
1786static struct snd_kcontrol_new snd_via8233_dxs_volume_control __devinitdata = { 1786static struct snd_kcontrol_new snd_via8233_dxs_volume_control = {
1787 .iface = SNDRV_CTL_ELEM_IFACE_PCM, 1787 .iface = SNDRV_CTL_ELEM_IFACE_PCM,
1788 .device = 0, 1788 .device = 0,
1789 /* .subdevice set later */ 1789 /* .subdevice set later */
@@ -1895,7 +1895,7 @@ static struct ac97_quirk ac97_quirks[] = {
1895 { } /* terminator */ 1895 { } /* terminator */
1896}; 1896};
1897 1897
1898static int __devinit snd_via82xx_mixer_new(struct via82xx *chip, const char *quirk_override) 1898static int snd_via82xx_mixer_new(struct via82xx *chip, const char *quirk_override)
1899{ 1899{
1900 struct snd_ac97_template ac97; 1900 struct snd_ac97_template ac97;
1901 int err; 1901 int err;
@@ -1930,7 +1930,7 @@ static int __devinit snd_via82xx_mixer_new(struct via82xx *chip, const char *qui
1930 1930
1931#ifdef SUPPORT_JOYSTICK 1931#ifdef SUPPORT_JOYSTICK
1932#define JOYSTICK_ADDR 0x200 1932#define JOYSTICK_ADDR 0x200
1933static int __devinit snd_via686_create_gameport(struct via82xx *chip, unsigned char *legacy) 1933static int snd_via686_create_gameport(struct via82xx *chip, unsigned char *legacy)
1934{ 1934{
1935 struct gameport *gp; 1935 struct gameport *gp;
1936 struct resource *r; 1936 struct resource *r;
@@ -1990,7 +1990,7 @@ static inline void snd_via686_free_gameport(struct via82xx *chip) { }
1990 * 1990 *
1991 */ 1991 */
1992 1992
1993static int __devinit snd_via8233_init_misc(struct via82xx *chip) 1993static int snd_via8233_init_misc(struct via82xx *chip)
1994{ 1994{
1995 int i, err, caps; 1995 int i, err, caps;
1996 unsigned char val; 1996 unsigned char val;
@@ -2047,7 +2047,7 @@ static int __devinit snd_via8233_init_misc(struct via82xx *chip)
2047 return 0; 2047 return 0;
2048} 2048}
2049 2049
2050static int __devinit snd_via686_init_misc(struct via82xx *chip) 2050static int snd_via686_init_misc(struct via82xx *chip)
2051{ 2051{
2052 unsigned char legacy, legacy_cfg; 2052 unsigned char legacy, legacy_cfg;
2053 int rev_h = 0; 2053 int rev_h = 0;
@@ -2137,7 +2137,7 @@ static void snd_via82xx_proc_read(struct snd_info_entry *entry,
2137 } 2137 }
2138} 2138}
2139 2139
2140static void __devinit snd_via82xx_proc_init(struct via82xx *chip) 2140static void snd_via82xx_proc_init(struct via82xx *chip)
2141{ 2141{
2142 struct snd_info_entry *entry; 2142 struct snd_info_entry *entry;
2143 2143
@@ -2370,12 +2370,12 @@ static int snd_via82xx_dev_free(struct snd_device *device)
2370 return snd_via82xx_free(chip); 2370 return snd_via82xx_free(chip);
2371} 2371}
2372 2372
2373static int __devinit snd_via82xx_create(struct snd_card *card, 2373static int snd_via82xx_create(struct snd_card *card,
2374 struct pci_dev *pci, 2374 struct pci_dev *pci,
2375 int chip_type, 2375 int chip_type,
2376 int revision, 2376 int revision,
2377 unsigned int ac97_clock, 2377 unsigned int ac97_clock,
2378 struct via82xx ** r_via) 2378 struct via82xx **r_via)
2379{ 2379{
2380 struct via82xx *chip; 2380 struct via82xx *chip;
2381 int err; 2381 int err;
@@ -2452,7 +2452,7 @@ struct via823x_info {
2452 char *name; 2452 char *name;
2453 int type; 2453 int type;
2454}; 2454};
2455static struct via823x_info via823x_cards[] __devinitdata = { 2455static struct via823x_info via823x_cards[] = {
2456 { VIA_REV_PRE_8233, "VIA 8233-Pre", TYPE_VIA8233 }, 2456 { VIA_REV_PRE_8233, "VIA 8233-Pre", TYPE_VIA8233 },
2457 { VIA_REV_8233C, "VIA 8233C", TYPE_VIA8233 }, 2457 { VIA_REV_8233C, "VIA 8233C", TYPE_VIA8233 },
2458 { VIA_REV_8233, "VIA 8233", TYPE_VIA8233 }, 2458 { VIA_REV_8233, "VIA 8233", TYPE_VIA8233 },
@@ -2466,7 +2466,7 @@ static struct via823x_info via823x_cards[] __devinitdata = {
2466 * auto detection of DXS channel supports. 2466 * auto detection of DXS channel supports.
2467 */ 2467 */
2468 2468
2469static struct snd_pci_quirk dxs_whitelist[] __devinitdata = { 2469static struct snd_pci_quirk dxs_whitelist[] = {
2470 SND_PCI_QUIRK(0x1005, 0x4710, "Avance Logic Mobo", VIA_DXS_ENABLE), 2470 SND_PCI_QUIRK(0x1005, 0x4710, "Avance Logic Mobo", VIA_DXS_ENABLE),
2471 SND_PCI_QUIRK(0x1019, 0x0996, "ESC Mobo", VIA_DXS_48K), 2471 SND_PCI_QUIRK(0x1019, 0x0996, "ESC Mobo", VIA_DXS_48K),
2472 SND_PCI_QUIRK(0x1019, 0x0a81, "ECS K7VTA3 v8.0", VIA_DXS_NO_VRA), 2472 SND_PCI_QUIRK(0x1019, 0x0a81, "ECS K7VTA3 v8.0", VIA_DXS_NO_VRA),
@@ -2510,7 +2510,7 @@ static struct snd_pci_quirk dxs_whitelist[] __devinitdata = {
2510 { } /* terminator */ 2510 { } /* terminator */
2511}; 2511};
2512 2512
2513static int __devinit check_dxs_list(struct pci_dev *pci, int revision) 2513static int check_dxs_list(struct pci_dev *pci, int revision)
2514{ 2514{
2515 const struct snd_pci_quirk *w; 2515 const struct snd_pci_quirk *w;
2516 2516
@@ -2535,8 +2535,8 @@ static int __devinit check_dxs_list(struct pci_dev *pci, int revision)
2535 return VIA_DXS_48K; 2535 return VIA_DXS_48K;
2536}; 2536};
2537 2537
2538static int __devinit snd_via82xx_probe(struct pci_dev *pci, 2538static int snd_via82xx_probe(struct pci_dev *pci,
2539 const struct pci_device_id *pci_id) 2539 const struct pci_device_id *pci_id)
2540{ 2540{
2541 struct snd_card *card; 2541 struct snd_card *card;
2542 struct via82xx *chip; 2542 struct via82xx *chip;
@@ -2643,7 +2643,7 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci,
2643 return err; 2643 return err;
2644} 2644}
2645 2645
2646static void __devexit snd_via82xx_remove(struct pci_dev *pci) 2646static void snd_via82xx_remove(struct pci_dev *pci)
2647{ 2647{
2648 snd_card_free(pci_get_drvdata(pci)); 2648 snd_card_free(pci_get_drvdata(pci));
2649 pci_set_drvdata(pci, NULL); 2649 pci_set_drvdata(pci, NULL);
@@ -2653,7 +2653,7 @@ static struct pci_driver via82xx_driver = {
2653 .name = KBUILD_MODNAME, 2653 .name = KBUILD_MODNAME,
2654 .id_table = snd_via82xx_ids, 2654 .id_table = snd_via82xx_ids,
2655 .probe = snd_via82xx_probe, 2655 .probe = snd_via82xx_probe,
2656 .remove = __devexit_p(snd_via82xx_remove), 2656 .remove = snd_via82xx_remove,
2657 .driver = { 2657 .driver = {
2658 .pm = SND_VIA82XX_PM_OPS, 2658 .pm = SND_VIA82XX_PM_OPS,
2659 }, 2659 },